面料损表返单日期逻辑调整

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

@@ -220,7 +220,7 @@ public class FabricLossController {
 					fabricLossReport.setFinalApproveDate(dtActionTime);
 					fabricLossReport.setStatus("完成");
 					syFabricLossReportService.updateById(fabricLossReport);
-				}else if (("面损表初审驳回".equalsIgnoreCase(action) || "面损表终审驳回".equalsIgnoreCase(action)) &&
+				}else if ("面损表初审驳回".equalsIgnoreCase(action) &&
 							oConvertUtils.isEmpty(fabricLossReport.getRejectBy())){
 					fabricLossReport.setRejectBy(actionUser);
 					fabricLossReport.setRejectDate(dtActionTime);

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

@@ -1565,9 +1565,13 @@ public class FabricLossServiceImpl extends ServiceImpl<FabricLossMapper, FabricL
 				});
 			}
 		}
+		// 转入成本有负数的，从正数扣除
 		// 入 - 出 ： 出大于0 的，是转入；入大于0 的是转出
 		for (FabricPoOrderIn itemIn : allInList){
 			Double inLeft = itemIn.getIQuantity();
+			if (inLeft<0){
+				continue;
+			}
 			for (FabricMoOrderCK itemOut : allOutList){
 				if (itemOut.getInvOutId().equalsIgnoreCase(itemIn.getInvId()) ||
 						itemIn.getInvId().equalsIgnoreCase(itemOut.getCSourceInvId())){