diff --git a/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java b/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java index c415a3b..29902d8 100644 --- a/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java +++ b/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java @@ -452,10 +452,12 @@ public class IssureNotifyServiceImpl implements IssureNotifyService { item.setNotifyNo(data.getNotifyNo()); item.setSite(data.getSite()); item.setItemNo(nextItem); - item.setbOMItemNo(String.valueOf(row.getItemNo())); + // 将 Double 类型的 itemNo 转换为整数字符串,去掉小数点后的0 + item.setbOMItemNo(row.getItemNo() != null ? String.valueOf(row.getItemNo().intValue()) : ""); item.setComponentPartNo(row.getComponentPartno()); // qty_required 字段在映射中落到 qtyRequired item.setQtyToIssue(BigDecimalUtils.multiply(data.getIssureQty(),row.getQtyAssembly(),3)); + item.setStandardDosage(BigDecimalUtils.multiply(data.getIssureQty(),row.getQtyAssembly(),3).doubleValue()); item.setIssueType("BOM物料"); item.setRemark(row.getRemark()); item.setWarehouseId(row.getOutboundWarehouseId()); diff --git a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml index 57a918c..fc9c947 100644 --- a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml +++ b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml @@ -169,10 +169,10 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu) insert into SOIssueNotifyOrderMaterialList - (NotifyNo, Site, ItemNo, BOMItemNo, ComponentPartNo, QtyToIssue, QtyToIssue_Original, issueType, remark, warehouse_id) + (NotifyNo, Site, ItemNo, BOMItemNo, ComponentPartNo, QtyToIssue, QtyToIssue_Original, issueType, remark, warehouse_id, standard_dosage) values - (#{item.notifyNo}, #{item.site}, #{item.itemNo}, #{item.bOMItemNo}, #{item.componentPartNo}, #{item.qtyToIssue}, 0, #{item.issueType}, #{item.remark}, #{item.warehouseId}) + (#{item.notifyNo}, #{item.site}, #{item.itemNo}, #{item.bOMItemNo}, #{item.componentPartNo}, #{item.qtyToIssue}, 0, #{item.issueType}, #{item.remark}, #{item.warehouseId}, #{item.standardDosage,jdbcType=FLOAT}) @@ -331,7 +331,7 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu) a.standard_dosage from SOIssueNotifyOrderMaterialList a left join SOIssueNotifyOrderList b on a.site = b.site and a.NotifyNo = b.NotifyNo and a.ItemNo = b.ItemNo - left join SOBOM c on c.site = b.site and b.SOOrderNo = c.OrderNo and c.ItemNo = b.OpsItemNo and c.ComponentPartNo = a.ComponentPartNo + left join SOBOM c on c.site = A.site and b.SOOrderNo = c.OrderNo and c.ItemNo = A.BOMItemNo and c.ComponentPartNo = a.ComponentPartNo left join WareHouse w on a.site = w.site and a.warehouse_id = w.WareHouseID where a.NotifyNo = #{notifyNo} and a.site = #{site} order by b.needDate, a.ItemNo diff --git a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml index 805bc2f..d6e8504 100644 --- a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml +++ b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml @@ -285,16 +285,55 @@