面料损耗更新

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/controller/FabricLossController.java

@@ -72,20 +72,20 @@ public class FabricLossController {
 	public Result<FabricLoss> getFabricLossDatas(@RequestParam(name="csocode",required=true) String csocode,
 	                                             @RequestParam(name="update",required=true) int update) {
 		SyFabricLossReport syFabricLossReport = null;
-		if (update == 0){
-			QueryWrapper<SyFabricLossReport> queryWrapper = new QueryWrapper<>();
-			queryWrapper.eq("plan_code", csocode);
-			List<SyFabricLossReport> syFabricLossReportList = syFabricLossReportService.list(queryWrapper);
-			if (syFabricLossReportList.size()>0){
-				syFabricLossReport = syFabricLossReportList.get(0);
-			}
+
+		QueryWrapper<SyFabricLossReport> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("plan_code", csocode);
+		List<SyFabricLossReport> syFabricLossReportList = syFabricLossReportService.list(queryWrapper);
+		if (syFabricLossReportList.size()>0){
+			syFabricLossReport = syFabricLossReportList.get(0);
 		}
+
 		FabricLoss fabricLoss = null;
 		if (syFabricLossReport != null){
 			fabricLoss = JSON.parseObject(JSON.toJSONString(syFabricLossReport.getContent()), FabricLoss.class);
 		}
-		if (fabricLoss == null) {
-			fabricLoss = fabricLossService.getFabricLossData(csocode);
+		if (fabricLoss == null || update == 1) {
+			fabricLoss = fabricLossService.getFabricLossData(csocode, fabricLoss);
 		}
 		Result<FabricLoss> result = new Result<>();
 		if (fabricLoss == null){
@@ -146,6 +146,7 @@ public class FabricLossController {
 		if (oConvertUtils.isEmpty(fabricLoss.getCCode())){
 			return ret.error500("无效的计划号，不能保存");
 		}
+		fabricLoss = fabricLossService.getFabricLossData(fabricLoss.getCCode(), fabricLoss);
 		fabricLoss.setEdit(1);
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/entity/FabricCostInvoice.java

@@ -49,4 +49,5 @@ public class FabricCostInvoice {
 	// 批号
 	@ApiModelProperty(value = "批号")
 	private  String cBatch;
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/entity/FabricMoOrderCK.java

@@ -63,4 +63,8 @@ public class FabricMoOrderCK {
     private String  cVCName;
     // 计划号，采购订单号或者委外订单号
     private String cPlanCode;
+
+    public String getInvOutId(){
+        return cInvCodeOut+cColorOut+cBatchOut;
+    }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/entity/FabricOMOrder.java

@@ -73,6 +73,8 @@ public class FabricOMOrder {
     List<FabricMoOrderRK> fabricMoOrderRKList;
     // 附件
     List<AccessorItem> accessorItemList;
+    // 余料详情
+    List<FabricPoOrderOut> fabricPoOrderOutList;
 
     /**
      * 获取分组id

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/mapper/FabricLossMapper.java

@@ -162,4 +162,14 @@ public interface FabricLossMapper extends BaseMapper<FabricLoss> {
 	// 根据委外订单子表id，获取处理费，入库数量，出库物料id，出库数量
 	@DS("multi-three")
 	List<Map<String,Object>> getOmInOutInfoListByDetailId(@Param("detailIdList")List<String> detailIdList);
+
+	// 获取委外入库物料被其他委外订单使用明细
+	@DS("multi-three")
+	List<FabricPoOrderOut> getMoOrderInToOther(@Param("code")String code);
+	// 获取委外入库仓库库存
+	@DS("multi-three")
+	List<FabricPoOrderOut> getMoStockList(@Param("code")String code);
+	// 获取本次委外入库的形态转换
+	@DS("multi-three")
+	List<Map<String,Object>> getMoAssemVouchList(@Param("code")String code);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/mapper/xml/FabricLossMapper.xml

@@ -938,4 +938,57 @@
 
 
 	</select>
+	<!--获取委外入库物料被其他委外订单使用明细 -->
+	<select id="getMoOrderInToOther" resultType="org.jeecg.modules.report.entity.FabricPoOrderOut">
+	select cCode,cInvCode,cColor,cBatch,sum(iQuantity) as iQuantity from
+	(
+		select cInvCode,isnull(cFree1,'') as cColor,isnull(cbatch,'') as cBatch,comcode as cCode,isnull(iSQuantity,iquantity) as iQuantity,0 as iPrice
+		from rdrecords11 where
+		comcode not like CONCAT(#{code},'%')
+		and (cInvCode+isnull(cFree1,'')+isnull(cbatch,'') in (
+		select b.cinvcode+isnull(b.cfree1,'')+isnull(b.cbatch,'') from RdRecords01 b
+		INNER JOIN OM_MODetails e on b.iOMoDID=e.MODetailsID
+		inner join om_momain f on f.moid = e.moid
+		where f.cCode like CONCAT(#{code},'%')
+		)
+		or cInvCode+isnull(cFree1,'')+isnull(cbatch,'') in (
+		select cInvCode2+isnull(cColor2,'')+isnull(cAVBatch2,'') from VIEW_FabricLoss_AssemVouchs where
+		cInvCode+isnull(cColor,'')+isnull(cAVBatch,'') in (
+		select b.cinvcode+isnull(b.cfree1,'')+isnull(b.cbatch,'') from RdRecords01 b
+		INNER JOIN OM_MODetails e on b.iOMoDID=e.MODetailsID
+		inner join om_momain f on f.moid = e.moid
+		where f.cCode like CONCAT(#{code},'%')
+		)
+		)
+		)
+	) as t1
+	group by cCode,cInvCode,cBatch,cColor
+	</select>
+	<!-- 获取委外入库仓库库存 -->
+	<select id="getMoStockList" resultType="org.jeecg.modules.report.entity.FabricPoOrderOut">
+		select a.cWhCode,b.cWhName ,a.cInvCode ,isnull(a.cFree1,'') as cColor ,isnull(a.cBatch,'') as cBatch ,a.iQuantity
+		from CurrentStock a inner join Warehouse b on a.cWhCode=b.cWhCode
+		where
+			a.iquantity>0 and
+			a.cinvcode+isnull(a.cfree1,'')+isnull(a.cBatch,'') in(
+				select r.cinvcode+isnull(r.cfree1,'')+isnull(r.cBatch,'')
+				from om_momain o
+				inner join OM_MODetails p on o.moid  =p.moid
+				inner join Inventory q on p.cInvCode=q.cInvCode
+				inner join RdRecords01 r on r.iOMoDID=p.MODetailsID
+				where o.cCode like CONCAT(#{code},'%')
+		)
+	</select>
+	<!--获取本次委外入库的形态转换-->
+	<select id="getMoAssemVouchList" resultType="map">
+
+		select * from VIEW_FabricLoss_AssemVouchs where
+		cInvCode+isnull(cAVBatch,'')+isnull(cColor,'') in (
+			select cInvCode+isnull(cBatch,'')+isnull(cFree1,'')  from RdRecords01
+			where iOMoDID in (
+			select b.MODetailsID from om_momain a inner join OM_MODetails b on a.moid  =b.moid
+			and a.cCode like CONCAT(#{code},'%')
+			)
+		)
+	</select>
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/service/IFabricLossService.java

@@ -29,7 +29,7 @@ import java.util.Set;
  */
 public interface IFabricLossService extends IService<FabricLoss> {
 	//获取面料损耗数据
-	FabricLoss getFabricLossData(String code);
+	FabricLoss getFabricLossData(String code, FabricLoss editData);
 
 	// 根据文件id，获取文件内容
 	byte[] getFileContent(String fileId);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/service/impl/FabricLossServiceImpl.java

@@ -66,11 +66,12 @@ public class FabricLossServiceImpl extends ServiceImpl<FabricLossMapper, FabricL
 	/**
 	 * 面料损耗信息接口
 	 * @param code 计划号
+	 * @param editData 传入的面损内容，用于重新计算单价、和更新保留修改内容
 	 * @return
 	 */
 	@Override
 	@Transactional(propagation = Propagation.NOT_SUPPORTED)
-	public FabricLoss getFabricLossData(String code) {
+	public FabricLoss getFabricLossData(String code, FabricLoss editData) {
 		if (oConvertUtils.isNotEmpty(code)){
 			FabricLoss ret = new FabricLoss();
 			ret.setEdit(0);
@@ -304,8 +305,11 @@ public class FabricLossServiceImpl extends ServiceImpl<FabricLossMapper, FabricL
 				fabricOMOrderList1.addAll(fabricOMOrderListTmp);
 			}
 			// 设置详情及成本
-			fabricOMOrderList1 = setFabricOMOrderOutDetail(fabricOMOrderList1, code);
+			fabricOMOrderList1 = setFabricOMOrderOutDetail(fabricOMOrderList1, code, editData);
 			fabricOMOrderList1 = setFabricOMOrderInDetail(fabricOMOrderList1, code);
+			// 设置余料去向
+			fabricOMOrderList1 = setFabricOMOrderLeftDetail(fabricOMOrderList1, code);
+
 			// 设置附件
 			fabricOMOrderList1.forEach(e->{
 				List<AccessorItem> accessorItemList1 = omAccList.stream().filter(a->a.getCInvId().equals(e.getCInvCode()+e.getCColor())).collect(Collectors.toList());
@@ -372,7 +376,7 @@ public class FabricLossServiceImpl extends ServiceImpl<FabricLossMapper, FabricL
 						List<FabricMoOrderCK> findList1 = ckList.stream().filter(e->
 								e.getCInvCodeOut().equals(fabricCostInvoice.getCInvCode()) &&
 										e.getCColorOut().equals(fabricCostInvoice.getCColor()) &&
-								e.getCBatchOut().equals(fabricCostInvoice.getCBatch())).collect(Collectors.toList());
+								e.getCBatchOut().equalsIgnoreCase(fabricCostInvoice.getCBatch())).collect(Collectors.toList());
 
 						for (FabricMoOrderCK ckItem : findList1) {
 							money+=ckItem.getIMoney();
@@ -415,7 +419,22 @@ public class FabricLossServiceImpl extends ServiceImpl<FabricLossMapper, FabricL
 			// 转入成本
 			fabricCostInvoiceList.addAll(getInCost(ret.getFabricPoOrderList(), fabricOMOrderListGn, fabricOMOrderListGw));
 			// 转出成本
-			fabricCostInvoiceList.addAll(getOutCost(ret.getFabricPoOrderList(), fabricOMOrderListGn, fabricOMOrderListGw));
+			List<FabricCostInvoice> outCostList = getOutCost(ret.getFabricPoOrderList(), fabricOMOrderListGn, fabricOMOrderListGw);
+			// 设置修改的工厂
+			if (editData != null){
+				List<FabricCostInvoice> editCostList = editData.getFabricCostInvoiceList();
+				if (oConvertUtils.listIsNotEmpty(editCostList)){
+					for (FabricCostInvoice item : outCostList){
+						Optional<FabricCostInvoice> findOpt = editCostList.stream().filter(e->e.getCVCName().equalsIgnoreCase(item.getCVCName()) &&
+								"转出成本".equalsIgnoreCase(e.getCBusType())).findFirst();
+						if (findOpt.isPresent()){
+							item.setCVenAbbName(findOpt.get().getCVenAbbName());
+						}
+					}
+				}
+			}
+			fabricCostInvoiceList.addAll(outCostList);
+
 
 			ret.setFabricCostInvoiceList(fabricCostInvoiceList);
 			// 计算单件成本
@@ -513,6 +532,10 @@ public class FabricLossServiceImpl extends ServiceImpl<FabricLossMapper, FabricL
 
 			// 质量事故单
 			ret.setFabricAccidentList(fabricLossMapper.getAccidentList(code));
+			// 设置备注
+			if (editData != null){
+				ret.setNoteOne(editData.getNoteOne());
+			}
 
 			return  ret;
 		}
@@ -523,9 +546,21 @@ public class FabricLossServiceImpl extends ServiceImpl<FabricLossMapper, FabricL
 	 * 设置委外订单材料出库详情
 	 * @param fabricOMOrderList - 委外订单列表
 	 * @param code - 计划号
+	 * @param editData - 要设置内容的面损
 	 * @return
 	 */
-	private List<FabricOMOrder> setFabricOMOrderOutDetail(List<FabricOMOrder> fabricOMOrderList, String code){
+	private List<FabricOMOrder> setFabricOMOrderOutDetail(List<FabricOMOrder> fabricOMOrderList, String code,
+	                                                      FabricLoss editData){
+		// 设置用户修改内容的数据
+		List<FabricOMOrder> editOmList = new ArrayList<>();
+		if (editData != null){
+			if (editData.getFabricOMOrderList1() != null){
+				editOmList.addAll(editData.getFabricOMOrderList1());
+			}
+			if (editData.getFabricOMOrderList2() != null){
+				editOmList.addAll(editData.getFabricOMOrderList2());
+			}
+		}
 		// 获取委外订单行id,入库物料编号+颜色,处理费用，入库数量
 		List<Map<String,Object>> rowInfoList = fabricLossMapper.getOmRowInfoList(code);
 		// 获取委外订单行id,出库物料信息,出库数量
@@ -654,7 +689,7 @@ public class FabricLossServiceImpl extends ServiceImpl<FabricLossMapper, FabricL
 
 
 
-		List<FabricMoOrderCK> fabricMoOrderCKList = getFabricMoOrderCKList(rowInfoList, rowOutList, rowInList, rowInListWithAV);
+		List<FabricMoOrderCK> fabricMoOrderCKList = getFabricMoOrderCKList(rowInfoList, rowOutList, rowInList, rowInListWithAV, editOmList);
 
 		for (FabricOMOrder fabricOMOrder : fabricOMOrderList){
 			// 根据入库物料过滤
@@ -921,7 +956,8 @@ public class FabricLossServiceImpl extends ServiceImpl<FabricLossMapper, FabricL
 	private List<FabricMoOrderCK> getFabricMoOrderCKList(List<Map<String,Object>> rowInfoList,
 	                                             List<FabricMoOrderCK> rowOutList,
 	                                             List<Map<String,Object>> rowInList,
-	                                             List<Map<String,Object>> rowInListWithAV){
+	                                             List<Map<String,Object>> rowInListWithAV,
+	                                                     List<FabricOMOrder> editOmList){
 		// 判断出库物料在形态转换里的，把入库物料从形态转换设置成本。只取一层
 		do{
 			// 出库物料不在入库单里的物料，在形态转换单里
@@ -1062,9 +1098,9 @@ public class FabricLossServiceImpl extends ServiceImpl<FabricLossMapper, FabricL
 			}
 			// 获取出库的入库
 			List<Map<String,Object>> findInByOutList = rowInList.stream().filter(in->
-					in.get("cInvCode").toString().equals(itemOut.getCInvCodeOut()) &&
-							in.get("cColor").toString().equals(itemOut.getCColorOut()) &&
-							in.get("cBatch").toString().equals(itemOut.getCBatchOut())).collect(Collectors.toList());
+					in.get("cInvCode").toString().equalsIgnoreCase(itemOut.getCInvCodeOut()) &&
+							in.get("cColor").toString().equalsIgnoreCase(itemOut.getCColorOut()) &&
+							in.get("cBatch").toString().equalsIgnoreCase(itemOut.getCBatchOut())).collect(Collectors.toList());
 			for (Map<String,Object> itemIn :findInByOutList){
 				Double inSum = oConvertUtils.getDouble(itemIn.get("iQuantity").toString(),0);
 				Double iPurchuseMoney = oConvertUtils.getDouble(itemIn.get("iPurchuseMoney").toString(),0);
@@ -1093,11 +1129,16 @@ public class FabricLossServiceImpl extends ServiceImpl<FabricLossMapper, FabricL
 				retItem.setIQuantity(bdVal.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
 				retItem.setIQuantityOut(itemOut.getIQuantityOut());
 				retItem.setIQuantityIn(inSum);
-				bdVal = new BigDecimal(iPurchuseMoney/inSum*curSum);
+				Double iPrice = getSaveOmOutPrice(editOmList, retItem.getMODetailsID(), retItem.getInvOutId());
+				if (iPrice == null){
+					iPrice = iPurchuseMoney/inSum;
+				}
+				bdVal = new BigDecimal(iPrice*curSum);
 				retItem.setIMoney(bdVal.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
-				bdVal = new BigDecimal(iPurchuseMoney/inSum);
+				bdVal = new BigDecimal(iPrice);
 				retItem.setIPrice(bdVal.setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue());
-				retItem.setICalPrice(retItem.getIPrice());
+				bdVal = new BigDecimal(iPurchuseMoney/inSum);
+				retItem.setICalPrice(bdVal.setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue());
 				if (outSum<=0){
 					break;
 				}
@@ -1105,7 +1146,7 @@ public class FabricLossServiceImpl extends ServiceImpl<FabricLossMapper, FabricL
 			// 形态转换前的入库
 			if (outSum>0){
 				List<Map<String,Object>> findInWithAVByOutList = rowInListWithAV.stream().filter(in->
-						in.get("cInvIdOut").toString().equals(itemOut.getCInvCodeOut()+itemOut.getCColorOut()+itemOut.getCBatchOut())).collect(Collectors.toList());
+						in.get("cInvIdOut").toString().equalsIgnoreCase(itemOut.getCInvCodeOut()+itemOut.getCColorOut()+itemOut.getCBatchOut())).collect(Collectors.toList());
 				for (Map<String,Object> itemIn :findInWithAVByOutList){
 					Double inSum = oConvertUtils.getDouble(itemIn.get("iQuantity").toString(),0);
 					Double iPurchuseMoney = oConvertUtils.getDouble(itemIn.get("iPurchuseMoney").toString(),0);
@@ -1134,11 +1175,16 @@ public class FabricLossServiceImpl extends ServiceImpl<FabricLossMapper, FabricL
 					retItem.setIQuantity(bdVal.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
 					retItem.setIQuantityOut(itemOut.getIQuantityOut());
 					retItem.setIQuantityIn(inSum);
-					bdVal = new BigDecimal(iPurchuseMoney/inSum*curSum);
+					Double iPrice = getSaveOmOutPrice(editOmList, retItem.getMODetailsID(), retItem.getInvOutId());
+					if (iPrice == null){
+						iPrice = iPurchuseMoney/inSum;
+					}
+					bdVal = new BigDecimal(iPrice*curSum);
 					retItem.setIMoney(bdVal.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
-					bdVal = new BigDecimal(iPurchuseMoney/inSum);
+					bdVal = new BigDecimal(iPrice);
 					retItem.setIPrice(bdVal.setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue());
-					retItem.setICalPrice(retItem.getIPrice());
+					bdVal = new BigDecimal(iPurchuseMoney/inSum);
+					retItem.setICalPrice(bdVal.setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue());
 					if (outSum<=0){
 						break;
 					}
@@ -1167,9 +1213,9 @@ public class FabricLossServiceImpl extends ServiceImpl<FabricLossMapper, FabricL
 			if (oConvertUtils.listIsNotEmpty(inList)){
 				for (FabricPoOrderIn itemIn : inList){
 					Optional<FabricPoOrderIn> findItemOpt = allInList.stream().filter(e->
-							e.getCInvCode().equals(itemIn.getCInvCode()) &&
-							e.getCColor().equals(itemIn.getCColor()) &&
-							e.getCBatch().equals(itemIn.getCBatch())).findFirst();
+							e.getCInvCode().equalsIgnoreCase(itemIn.getCInvCode()) &&
+							e.getCColor().equalsIgnoreCase(itemIn.getCColor()) &&
+							e.getCBatch().equalsIgnoreCase(itemIn.getCBatch())).findFirst();
 					if (findItemOpt.isPresent()){
 						FabricPoOrderIn formatItem = findItemOpt.get();
 						Double dMoney = formatItem.getIPrice()*formatItem.getIQuantity()+itemIn.getIPrice()*itemIn.getIQuantity();
@@ -1275,9 +1321,9 @@ public class FabricLossServiceImpl extends ServiceImpl<FabricLossMapper, FabricL
 
 			double inLeft = itemIn.getIQuantity();
 			for (FabricMoOrderCK outItem : omOutListAll){
-				if (outItem.getCBatchOut().equals(itemIn.getCBatch()) &&
-					outItem.getCInvCodeOut().equals(itemIn.getCInvCode()) &&
-					outItem.getCColorOut().equals(itemIn.getCColor())){
+				if (outItem.getCBatchOut().equalsIgnoreCase(itemIn.getCBatch()) &&
+					outItem.getCInvCodeOut().equalsIgnoreCase(itemIn.getCInvCode()) &&
+					outItem.getCColorOut().equalsIgnoreCase(itemIn.getCColor())){
 					double outLeft = outItem.getIQuantity();
 					bOmFind = true;
 					inLeft -= outLeft;
@@ -1306,9 +1352,9 @@ public class FabricLossServiceImpl extends ServiceImpl<FabricLossMapper, FabricL
 				}
 				if (useOutList != null){
 					for (FabricPoOrderOut outItem : useOutList){
-						if (outItem.getCBatch().equals(itemIn.getCBatch()) &&
-								outItem.getCInvCode().equals(itemIn.getCInvCode()) &&
-								outItem.getCColor().equals(itemIn.getCColor())){
+						if (outItem.getCBatch().equalsIgnoreCase(itemIn.getCBatch()) &&
+								outItem.getCInvCode().equalsIgnoreCase(itemIn.getCInvCode()) &&
+								outItem.getCColor().equalsIgnoreCase(itemIn.getCColor())){
 							double outLeft = outItem.getIQuantity();
 							inLeft -= outLeft;
 							if (inLeft<0){
@@ -1400,9 +1446,9 @@ public class FabricLossServiceImpl extends ServiceImpl<FabricLossMapper, FabricL
 					if (oConvertUtils.listIsNotEmpty(orderOutList)) {
 						for (FabricPoOrderOut orderOut : orderOutList) {
 							List<FabricMoOrderCK> findOrderCKList = moOrderCKList.stream().filter(e ->
-									e.getCInvCodeOut().equals(orderOut.getCInvCode()) &&
-											e.getCColorOut().equals(orderOut.getCColor()) &&
-											e.getCBatchOut().equals(orderOut.getCBatch())).collect(Collectors.toList());
+									e.getCInvCodeOut().equalsIgnoreCase(orderOut.getCInvCode()) &&
+											e.getCColorOut().equalsIgnoreCase(orderOut.getCColor()) &&
+											e.getCBatchOut().equalsIgnoreCase(orderOut.getCBatch())).collect(Collectors.toList());
 							if (findOrderCKList.size() > 0) {
 								orderOut.setIPrice(findOrderCKList.get(0).getIPrice());
 								BigDecimal bdVal = new BigDecimal(orderOut.getIQuantity()*orderOut.getIPrice());
@@ -1434,9 +1480,9 @@ public class FabricLossServiceImpl extends ServiceImpl<FabricLossMapper, FabricL
 			if (oConvertUtils.listIsNotEmpty(inList)){
 				for (FabricPoOrderIn itemIn : inList){
 					Optional<FabricPoOrderIn> findItemOpt = allInList.stream().filter(e->
-							e.getCInvCode().equals(itemIn.getCInvCode()) &&
-									e.getCColor().equals(itemIn.getCColor()) &&
-									e.getCBatch().equals(itemIn.getCBatch())).findFirst();
+							e.getCInvCode().equalsIgnoreCase(itemIn.getCInvCode()) &&
+									e.getCColor().equalsIgnoreCase(itemIn.getCColor()) &&
+									e.getCBatch().equalsIgnoreCase(itemIn.getCBatch())).findFirst();
 					if (findItemOpt.isPresent()){
 						FabricPoOrderIn formatItem = findItemOpt.get();
 						Double dMoney = formatItem.getIPrice()*formatItem.getIQuantity()+itemIn.getIPrice()*itemIn.getIQuantity();
@@ -1513,9 +1559,9 @@ public class FabricLossServiceImpl extends ServiceImpl<FabricLossMapper, FabricL
 
 			double outLeft = itemOut.getIQuantity();
 			for (FabricPoOrderIn itemIn : allInList){
-				if (itemOut.getCBatchOut().equals(itemIn.getCBatch()) &&
-						itemOut.getCInvCodeOut().equals(itemIn.getCInvCode()) &&
-						itemOut.getCColorOut().equals(itemIn.getCColor())){
+				if (itemOut.getCBatchOut().equalsIgnoreCase(itemIn.getCBatch()) &&
+						itemOut.getCInvCodeOut().equalsIgnoreCase(itemIn.getCInvCode()) &&
+						itemOut.getCColorOut().equalsIgnoreCase(itemIn.getCColor())){
 					double inLeft = itemIn.getIQuantity();
 
 					outLeft -= inLeft;
@@ -1594,4 +1640,118 @@ public class FabricLossServiceImpl extends ServiceImpl<FabricLossMapper, FabricL
 
 	}
 
+	/**
+	 * 设置委外订单余料数据
+	 * @param fabricOMOrderList
+	 * @param code
+	 * @return
+	 */
+
+	private List<FabricOMOrder> setFabricOMOrderLeftDetail(List<FabricOMOrder> fabricOMOrderList, String code){
+		// 获取本次委外入库的形态转换
+		List<Map<String,Object>> fabricAssemVouchList = fabricLossMapper.getMoAssemVouchList(code);
+
+		// 采购入库被其他委外订单使用的信息
+		List<FabricPoOrderOut> fabricPoOrderOutList = fabricLossMapper.getMoOrderInToOther(code);
+		// 采购入库仓库库存
+		List<FabricPoOrderOut> poOrderStockList = fabricLossMapper.getMoStockList(code);
+		// 采购订单设置分配数量、委外供应商、余纱、采购损耗
+		for (FabricOMOrder omOrder : fabricOMOrderList){
+			// 委外入库的批次，及单价（单价=（单价*数量）加/数量
+
+			if (omOrder.getFabricMoOrderRKList() == null){
+				continue;
+			}
+			List<String> inBatchList = new ArrayList<>();
+			Double dSum=0.0,dMoney=0.0,dPrice=0.0;
+			for (FabricMoOrderRK rkItem : omOrder.getFabricMoOrderRKList()){
+				inBatchList.add(rkItem.getCBatch().toLowerCase());
+				dSum = DoubleOperation.add(dSum,omOrder.getIQuantityIn());
+				dMoney = DoubleOperation.add(dMoney, DoubleOperation.mul(rkItem.getIQuantityIn(),rkItem.getIPrice()));
+			}
+			if (dSum>0){
+				dPrice = DoubleOperation.div(dMoney,dSum,4);
+			}
+			// 获取委外形态转换物料
+			List<Map<String, Object>> tmpAssemVouchList = fabricAssemVouchList.stream().filter(e->
+					oConvertUtils.getString(e.get("cInvCode")).equals(omOrder.getCInvCode()) &&
+							oConvertUtils.getString(e.get("cColor")).equals(omOrder.getCColor()) &&
+							inBatchList.contains(oConvertUtils.getString(e.get("cBatch")).toLowerCase())).collect(Collectors.toList());
+
+			// 未形态转换物料
+			List<FabricPoOrderOut> tmpOmOutList1 = fabricPoOrderOutList.stream().filter(e->
+					e.getCInvCode().equals(omOrder.getCInvCode()) &&
+							e.getCColor().equals(omOrder.getCColor()) &&
+							inBatchList.contains(oConvertUtils.getString(e.getCBatch()).toLowerCase())).collect(Collectors.toList());
+
+
+			// 形态转换物料
+			List<FabricPoOrderOut> tmpOmOutList2 = fabricPoOrderOutList.stream().filter(out->{
+				return tmpAssemVouchList.stream().filter(e ->
+						oConvertUtils.getString(e.get("cInvCode2")).equals(omOrder.getCInvCode()) &&
+								oConvertUtils.getString(e.get("cColor2")).equals(omOrder.getCColor()) &&
+								inBatchList.contains(oConvertUtils.getString(e.get("cAVBatch2")).toLowerCase())
+				).count() > 0;
+			}).collect(Collectors.toList());
+
+			tmpOmOutList1.addAll(tmpOmOutList2);
+
+
+			for (FabricPoOrderOut item : tmpOmOutList1){
+				String cCode = item.getCCode();
+				int index1 = cCode.indexOf("SY");
+				if (index1 == -1) {
+					continue;
+				}
+				int index2 = cCode.indexOf("-", index1);
+				if (index2 == -1) {
+					index2 = cCode.length();
+				}
+				item.setIPrice(dPrice);
+				item.setIMoney(DoubleOperation.mul(dPrice, item.getIQuantity()));
+
+			}
+			// 设置仓库库存
+			List<FabricPoOrderOut> findPoOrderStockList = poOrderStockList.stream().filter(e->
+					omOrder.getCInvCode().equals(e.getCInvCode()) &&
+							oConvertUtils.getString(omOrder.getCColor()).equals(e.getCColor()) &&
+					inBatchList.contains(e.getCBatch().toLowerCase())).collect(Collectors.toList());
+			for (FabricPoOrderOut item : findPoOrderStockList){
+				item.setIPrice(dPrice);
+				item.setIMoney(DoubleOperation.mul(dPrice, item.getIQuantity()));
+
+			}
+			tmpOmOutList1.addAll(findPoOrderStockList);
+
+			omOrder.setFabricPoOrderOutList(tmpOmOutList1);
+		}
+		return fabricOMOrderList;
+	}
+
+	/**
+	 * 获取用户保存的出库单价，根据委外订单id，出库物料id获取
+	 * @param editOmList
+	 * @param modetailsID
+	 * @param invOutId
+	 * @return
+	 */
+	private Double getSaveOmOutPrice(List<FabricOMOrder> editOmList, String modetailsID, String invOutId){
+		Optional<FabricOMOrder> findOpt = editOmList.stream().filter(e->e.getMODetailsID().indexOf(modetailsID)>-1).findFirst();
+		if (findOpt.isPresent()){
+			FabricOMOrder findItem = findOpt.get();
+			List<FabricMoOrderCK> ckList = findItem.getFabricMoOrderCKList();
+			if (oConvertUtils.listIsNotEmpty(ckList)){
+				Optional<FabricMoOrderCK> findCkOpt = ckList.stream().filter(e->e.getInvOutId().equalsIgnoreCase(invOutId)).findFirst();
+				if (findCkOpt.isPresent()){
+					FabricMoOrderCK findCkItem = findCkOpt.get();
+					if (!findCkItem.getIPrice().equals(findCkItem.getICalPrice())){
+						return findCkOpt.get().getIPrice();
+					}
+
+				}
+			}
+		}
+		return null;
+	}
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/DoubleOperation.java

@@ -39,6 +39,9 @@ public class DoubleOperation {
 	public static Double div(Double d1, Double d2, int scale){
 		BigDecimal p1 = new BigDecimal(Double.toString(d1));
 		BigDecimal p2 = new BigDecimal(Double.toString(d2));
+		if (d2 == 0.0){
+			return 0.0;
+		}
 		return p1.divide(p2, scale, BigDecimal.ROUND_HALF_UP).doubleValue();
 	}
 }