发运明细回写数量调整，增加字段

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/controller/SyShippingDetailsController.java

@@ -167,6 +167,14 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 		if(oConvertUtils.isNotEmpty(supplier)){
 			queryWrapper.like("t.supplier",supplier);
 		}
+		//分销点
+		if(oConvertUtils.isNotEmpty(syShippingDetails.getDistributionPoint())){
+			queryWrapper.like("t.distributionPoint",syShippingDetails.getDistributionPoint());
+		}
+		//客户
+		if(oConvertUtils.isNotEmpty(syShippingDetails.getCustomerAbbreviation())){
+			queryWrapper.like("t.customerAbbreviation",syShippingDetails.getCustomerAbbreviation());
+		}
 		if(oConvertUtils.isNotEmpty(isElement)){
 			if(isElement.equals("0")){//没有维护
 				queryWrapper.isNull("t.elementsId");
@@ -513,7 +521,10 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 				}
 			  	//如果面料是光还 供应商(柒厂) =供应商 如果是印花布 则根据 将供应商柒厂) 是印花布的材料来源供应商 这2列都需要带值
 				  String sub = li.getInventoryCcode().substring(0,2);
-			  	  String subTwo = li.getInventoryCcode().substring(0,4);
+			  	  String sub2 = "";
+				  if(li.getInventoryCcode().length() >= 4){
+					  sub2 = li.getInventoryCcode().substring(0,4);
+				  }
 			  	//03 = 光坯，04 = 印花
                 if(sub.equals("03")){
 					li.setSupplier(li.getSupplier());
@@ -534,7 +545,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 					  }
 				  }
 				  //如果是辅料，报关数量取发运明细数量
-				  if(sub.equals("05")||sub.equals("06")||sub.equals("07")|| subTwo.equals("0299")|| subTwo.equals("0399") || subTwo.equals("0499")){
+				  if(sub.equals("05")||sub.equals("06")||sub.equals("07")|| sub2.equals("0299")|| sub2.equals("0399") || sub2.equals("0499")){
 					 li.setCustomsQuantity(li.getShipmentQuantity().toString());
 				  }else{
 					  li.setCustomsQuantity("");

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/service/impl/SyShippingDetailsServiceImpl.java

@@ -171,7 +171,7 @@ public class SyShippingDetailsServiceImpl extends ServiceImpl<SyShippingDetailsM
                 //查询订单子表信息
                 SyOrderDataItem orderDataItem = syOrderDataItemService.getById(li.getSyOrderDataItemId());
                 //直接设置为0，因为参照直接生成单据，数量不能更改，所以剩余数量会全部参照完
-                orderDataItem.setSurplusNum(BigDecimal.ZERO);
+                orderDataItem.setSurplusNum(orderDataItem.getSurplusNum().subtract(li.getQuantity()));
                 syOrderDataItemService.updateById(orderDataItem);
             }
 
@@ -221,12 +221,16 @@ public class SyShippingDetailsServiceImpl extends ServiceImpl<SyShippingDetailsM
             SyOrderDataItem orderDataItem = syOrderDataItemService.getById(li.getSyOrderDataItemId());
 
             if (oConvertUtils.isNotEmpty(orderDataItem)) {
-                //订单箱数减去发货数量
-                BigDecimal suerBox = orderDataItem.getQuantity().subtract(li.getShipmentQuantity());
-                orderDataItem.setSurplusNum(suerBox);
-                syOrderDataItemService.updateById(orderDataItem);
-                //设置发运明细子表订单剩余数量
-                //li.setOrderRemainingQuantity(suerBox);
+                //订单数量减去发货数量
+                if(li.getShipmentQuantity().compareTo(orderDataItem.getQuantity()) == 1){
+                    BigDecimal suerBox = orderDataItem.getQuantity().subtract(li.getShipmentQuantity());
+                    orderDataItem.setSurplusNum(suerBox);
+                    syOrderDataItemService.updateById(orderDataItem);
+                }else if(li.getShipmentQuantity().compareTo(orderDataItem.getQuantity()) == -1){
+                    BigDecimal suerBox = orderDataItem.getQuantity().add(li.getShipmentQuantity());
+                    orderDataItem.setSurplusNum(suerBox);
+                    syOrderDataItemService.updateById(orderDataItem);
+                }
                 //设置发运明细子表剩余数量
                 li.setSurplusQuantity(li.getShipmentQuantity());
             }
@@ -407,7 +411,7 @@ public class SyShippingDetailsServiceImpl extends ServiceImpl<SyShippingDetailsM
 
     /**
      * 发运明细修改单行删除
-     * @param ids
+     * @param id
      * @return
      */
     @Override