面料损耗更新

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

@@ -123,6 +123,11 @@ public class FabricPoOrder {
                 if (findItem.getOmcVenAbbName().indexOf(poOrderOut.getCVenAbbName()) == -1){
                     findItem.setOmcVenAbbName(findItem.getOmcVenAbbName()+","+poOrderOut.getCVenAbbName());
                 }
+                if ("来源余料".equalsIgnoreCase(cPOID)) {
+                    if (findItem.getCVenAbbName().indexOf(poOrderOut.getCPoVenAbbName()) == -1) {
+                        findItem.setCVenAbbName(findItem.getCVenAbbName() + "," + poOrderOut.getCPoVenAbbName());
+                    }
+                }
             }else{
                 FabricPoOrder poOrder = new FabricPoOrder();
                 poOrder.setCInvName(poOrderOut.getCInvName()+" "+poOrderOut.getCColor());
@@ -130,6 +135,9 @@ public class FabricPoOrder {
                 poOrder.setCColor(poOrderOut.getCColor());
                 poOrder.setCInvCode(poOrderOut.getCInvCode());
                 poOrder.setOmcVenAbbName(poOrderOut.getCVenAbbName());
+                if ("来源余料".equalsIgnoreCase(cPOID)){
+                    poOrder.setCVenAbbName(oConvertUtils.getString(poOrderOut.getCPoVenAbbName()));
+                }
                 poOrder.setIQuantityIn(poOrderOut.getIQuantity());
                 poOrder.setIQuantityOut(poOrderOut.getIQuantity());
                 List<FabricPoOrderOut> findOutList = poOrderOutGroupList.stream().filter(e->e.getParentId().equals(poOrder.getId())).collect(Collectors.toList());

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

@@ -49,6 +49,8 @@ public class FabricPoOrderOut {
 	String cWhName;
 	@ApiModelProperty(value = "委外供应商简称")
 	String cVenAbbName;
+	@ApiModelProperty(value = "采购供应商简称")
+	String cPoVenAbbName;
 
 	public String getParentId(){
 		return cInvCode+cColor;
@@ -75,6 +77,7 @@ public class FabricPoOrderOut {
 		orderOut.setCWhCode("");
 		orderOut.setCWhName("");
 		orderOut.setCVenAbbName(moOrderCK.getCOmVenAbbName());
+		orderOut.setCPoVenAbbName(oConvertUtils.getString(moOrderCK.getCVenAbbName()));
 		if ("期初".equalsIgnoreCase(orderOut.getCBatch())){
 			orderOut.setCPlanCode("期初");
 		}else if ("杂纱".equalsIgnoreCase(orderOut.getCInvName())){

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

@@ -811,7 +811,7 @@ public class FabricLossServiceImpl extends ServiceImpl<FabricLossMapper, FabricL
 			List<FabricCostInvoice> costInvoiceList = editData.getFabricCostInvoiceList();
 			for (FabricCostInvoice costInvoice : fabricCostInvoiceList){
 				Optional<FabricCostInvoice> findOpt = costInvoiceList.stream().filter(e->e.getId().equalsIgnoreCase(costInvoice.getId())).findFirst();
-				if (findOpt.isPresent()){
+				if (findOpt.isPresent() && findOpt.get().getINoTaxMoney() != null){
 					costInvoice.setINoTaxMoney(findOpt.get().getINoTaxMoney());
 				}
 			}