发运明细修改回写数据调整，是否参照调整

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

@@ -162,7 +162,11 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 			queryWrapper.like("t.itemNumber",syShippingDetails.getItemNumber());
 		}
 		if(oConvertUtils.isNotEmpty(refer)){
-			queryWrapper.eq("t.isReference",refer);
+			if(refer.equals("0")){
+				queryWrapper.eq("t.isReference","0");
+			}else{
+				queryWrapper.ne("t.isReference","0");
+			}
 		}
 		if(oConvertUtils.isNotEmpty(supplier)){
 			queryWrapper.like("t.supplier",supplier);
@@ -520,7 +524,8 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 
 	  try {
 		  Page<SyShippingDetailsVo> page = new Page<SyShippingDetailsVo>(1, -1);
-		  if(syShippingDetails.getFlourOrGarment().equals("0")){//面辅料
+		  //面辅料
+		  if(syShippingDetails.getFlourOrGarment().equals("0")){
 
 			  List<SyShippingDetailsVo> itemList = syShippingDetailsMapper.excelItem(queryWrapper);
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/mapper/xml/SyShippingDetailsMapper.xml

@@ -154,7 +154,7 @@ ${ew.customSqlSegment} and  t.inventoryCcode not LIKE '19%'
            a.whole_order_total as wholeOrderTotal,a.sales_department as salesDepartment,a.salesman as salesman,a.currency_text as currencyText,a.third_party as thirdParty,
             a.deposit_ratio as depositRatio,a.deposit as deposit,a.collaborative_route as collaborativeRoute,a.term_of_payment as termOfPayment,a.end_customer as endCustomer,
              a.order_remarks as orderRemarks,a.price_remarks as priceRemarks,a.order_change_description as orderChangeDescription,b.supplier as supplier,b.i_tax_price as iTaxPrice,
-             case when b.ymoney is null then '0' else b.ymoney end as ymoney,b.ompo_id as ompoId,b.inventory_ccode as inventoryCcode,
+             case when b.ymoney is null then '0' else b.ymoney end as ymoney,b.ompo_id as ompoId,b.inventory_ccode as inventoryCcode,b.d_arrive_date as dArriveDate,b.master_metering as masterMetering,
              b.ompo_id_item as ompoIdItem,b.ompo_account as ompoAccount,b.ompo_code as purOrSubOrder,b.r_supplier_code as rSupplierCode,b.r_supplier as rSupplier
              from sy_order_data a
               left join sy_order_data_item b
@@ -242,7 +242,7 @@ ${ew.customSqlSegment}
        b.order_number as orderNumber,b.item_number as itemNumber,b.colour,b.pre_delivery_date as preDeliveryDate,b.sales_unit_price as salesUnitPrice,
         b.inventory_code as inventoryCode,b.inventory_name as inventoryName,c.declaration_name as declarationName,a.create_by as createBy,a.create_time as createTime,
         b.material_composition as materialComposition,b.guangpei_gate_width as guangpeiGateWidth,b.weight as weight,b.is_reference as isReference,
-        b.excess_quantity as excessQuantity,d.master_metering as masterMetering,b.garment_factory as garmentFactory,b.shipment_quantity as shipmentQuantity,
+        b.excess_quantity as excessQuantity,c.declaration_unit as masterMetering,b.garment_factory as garmentFactory,b.shipment_quantity as shipmentQuantity,
         b.id as itemIds,a.id as id,b.elements_id as elementsId,b.r_supplier_code as rSupplierCode,b.r_supplier as rSupplier,
         b.supplier,b.supplier_code as supplierCode,b.specification_and_model as specificationAndModel,b.inventory_ccode as inventoryCcode
          from sy_shipping_details a

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

@@ -221,14 +221,16 @@ public class SyShippingDetailsServiceImpl extends ServiceImpl<SyShippingDetailsM
             SyOrderDataItem orderDataItem = syOrderDataItemService.getById(li.getSyOrderDataItemId());
 
             if (oConvertUtils.isNotEmpty(orderDataItem)) {
-                //订单数量减去发货数量
+
                 if(li.getShipmentQuantity().compareTo(orderDataItem.getQuantity()) == 1){
-                    BigDecimal suerBox = orderDataItem.getQuantity().subtract(li.getShipmentQuantity());
-                    orderDataItem.setSurplusNum(suerBox);
+                    BigDecimal suerBox = li.getShipmentQuantity().subtract(orderDataItem.getQuantity());
+                    BigDecimal suerBox2 = orderDataItem.getSurplusNum().subtract(suerBox);
+                    orderDataItem.setSurplusNum(suerBox2);
                     syOrderDataItemService.updateById(orderDataItem);
                 }else if(li.getShipmentQuantity().compareTo(orderDataItem.getQuantity()) == -1){
-                    BigDecimal suerBox = orderDataItem.getQuantity().add(li.getShipmentQuantity());
-                    orderDataItem.setSurplusNum(suerBox);
+                    BigDecimal suerBox = orderDataItem.getQuantity().subtract(li.getShipmentQuantity());
+                    BigDecimal suerBox2 = orderDataItem.getSurplusNum().add(suerBox);
+                    orderDataItem.setSurplusNum(suerBox2);
                     syOrderDataItemService.updateById(orderDataItem);
                 }
                 //设置发运明细子表剩余数量