diff --git a/.DS_Store b/.DS_Store index f0764fdf..5c48b8fc 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.gitignore b/.gitignore index a5fc2335..234d401f 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,7 @@ dist/ nbdist/ .nb-gradle/ .DS_Store +*.png ###################################################################### # Others diff --git "a/D:\\ruoyi\\uploadPath\\oms/upload/2026/09/21/企业微信截图_0645af68-828e-4136-97e5-ab0de7e5983b_20260921143531A001.png" "b/D:\\ruoyi\\uploadPath\\oms/upload/2026/09/21/企业微信截图_0645af68-828e-4136-97e5-ab0de7e5983b_20260921143531A001.png" deleted file mode 100644 index a96b47dd..00000000 Binary files "a/D:\\ruoyi\\uploadPath\\oms/upload/2026/09/21/企业微信截图_0645af68-828e-4136-97e5-ab0de7e5983b_20260921143531A001.png" and /dev/null differ diff --git "a/D:\\ruoyi\\uploadPath\\oms/upload/2026/09/21/企业微信截图_0645af68-828e-4136-97e5-ab0de7e5983b_20260921163507A002.png" "b/D:\\ruoyi\\uploadPath\\oms/upload/2026/09/21/企业微信截图_0645af68-828e-4136-97e5-ab0de7e5983b_20260921163507A002.png" deleted file mode 100644 index a96b47dd..00000000 Binary files "a/D:\\ruoyi\\uploadPath\\oms/upload/2026/09/21/企业微信截图_0645af68-828e-4136-97e5-ab0de7e5983b_20260921163507A002.png" and /dev/null differ diff --git "a/D:\\ruoyi\\uploadPath\\oms/upload/2026/09/21/企业微信截图_0645af68-828e-4136-97e5-ab0de7e5983b_20260921163604A001.png" "b/D:\\ruoyi\\uploadPath\\oms/upload/2026/09/21/企业微信截图_0645af68-828e-4136-97e5-ab0de7e5983b_20260921163604A001.png" deleted file mode 100644 index a96b47dd..00000000 Binary files "a/D:\\ruoyi\\uploadPath\\oms/upload/2026/09/21/企业微信截图_0645af68-828e-4136-97e5-ab0de7e5983b_20260921163604A001.png" and /dev/null differ diff --git "a/D:\\ruoyi\\uploadPath\\oms/upload/2026/09/21/企业微信截图_0645af68-828e-4136-97e5-ab0de7e5983b_20260921163837A002.png" "b/D:\\ruoyi\\uploadPath\\oms/upload/2026/09/21/企业微信截图_0645af68-828e-4136-97e5-ab0de7e5983b_20260921163837A002.png" deleted file mode 100644 index a96b47dd..00000000 Binary files "a/D:\\ruoyi\\uploadPath\\oms/upload/2026/09/21/企业微信截图_0645af68-828e-4136-97e5-ab0de7e5983b_20260921163837A002.png" and /dev/null differ diff --git "a/D:\\ruoyi\\uploadPath\\oms/upload/2026/09/21/企业微信截图_0645af68-828e-4136-97e5-ab0de7e5983b_20260921163849A003.png" "b/D:\\ruoyi\\uploadPath\\oms/upload/2026/09/21/企业微信截图_0645af68-828e-4136-97e5-ab0de7e5983b_20260921163849A003.png" deleted file mode 100644 index a96b47dd..00000000 Binary files "a/D:\\ruoyi\\uploadPath\\oms/upload/2026/09/21/企业微信截图_0645af68-828e-4136-97e5-ab0de7e5983b_20260921163849A003.png" and /dev/null differ diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsInventoryInnerServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsInventoryInnerServiceImpl.java index 056433a9..5e56d899 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsInventoryInnerServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsInventoryInnerServiceImpl.java @@ -197,10 +197,9 @@ public class OmsInventoryInnerServiceImpl implements IOmsInventoryInnerService { OmsPayableBill payableBill = new OmsPayableBill(); VendorInfo vendorInfo = vendorInfoService.selectVendorInfoByVendorCode(vendorCode); - boolean innerPay = vendorInfo != null && VendorInfo.PayTypeEnum.INNER_PAY.getCode().equals(vendorInfo.getPayType()); - boolean notStandard = !Arrays.asList("1", "2").contains(omsInventoryInner.getProductType()); - //每次入库均生成应付单,金额按本次入库量计算 - if (innerPay || notStandard) { + //入库付款厂商(INNER_PAY)或非标准品(服务/维保)在入库时生成应付单,金额按本次入库量计算 + if ((vendorInfo != null && VendorInfo.PayTypeEnum.INNER_PAY.getCode().equals(vendorInfo.getPayType())) + || !Arrays.asList("1", "2").contains(omsInventoryInner.getProductType())) { BigDecimal reduce = inventoryInfoList.stream().map(InventoryInfo::getInnerPrice).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add); //服务金额为单价*数量 没有具体的详情 BigDecimal totalPriceWithTax = Arrays.asList("3", "22").contains(omsInventoryInner.getProductType()) ?