托书调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/controller/SyShippingOrderController.java

@@ -815,6 +815,19 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 						 entity.setColour(split[9]);
 						 entity.setMadeInChina(split[10]);
 						 entity.setSizeBreakdown(split[11]);
+					 }else{
+						 entity.setPrimark(" ");
+						 entity.setKimballNo(" ");
+						 entity.setOrderNo(" ");
+						 entity.setCartonGrossWeight(" ");
+						 entity.setCartonDimensions(" ");
+						 entity.setCartonNumber(" ");
+						 entity.setCartonQuantity(" ");
+						 entity.setSubSectionDescription(" ");
+						 entity.setAssortedSizeCodes(" ");
+						 entity.setColour(" ");
+						 entity.setMadeInChina(" ");
+						 entity.setSizeBreakdown(" ");
 					 }
 				 }
 
@@ -934,6 +947,19 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 						 entity.setColour(split[9]);
 						 entity.setMadeInChina(split[10]);
 						 entity.setSizeBreakdown(split[11]);
+					 }else{
+						 entity.setPrimark(" ");
+						 entity.setKimballNo(" ");
+						 entity.setOrderNo(" ");
+						 entity.setCartonGrossWeight(" ");
+						 entity.setCartonDimensions(" ");
+						 entity.setCartonNumber(" ");
+						 entity.setCartonQuantity(" ");
+						 entity.setSubSectionDescription(" ");
+						 entity.setAssortedSizeCodes(" ");
+						 entity.setColour(" ");
+						 entity.setMadeInChina(" ");
+						 entity.setSizeBreakdown(" ");
 					 }
 				 }
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/mapper/xml/SyShippingOrderMapper.xml

@@ -79,7 +79,7 @@ SELECT GROUP_CONCAT(id) as id, sy_shipping_order_item_id as syShippingOrderItemI
 sum(number) as number, box_number as boxNumber, sum(gross_weight) as grossWeight, sum(net_weight) as netWeight, sum(volume) as volume,sum(total_price) as totalPrice,
 distribution_point as distributionPoint, container_code as containerCode, container_number as containerNumber, unit_price as unitPrice, pre_shipment_date as preShipmentDate,
 salesman, operating_department as operatingDepartment, purchase_outsourcing_order_no as purOrSubOrder, outsourcing_factory_for_procurement as outsourcingFactoryForProcurement,
- memo, sort, ready_fabric as readyFabric, tailoring_fabric_id as tailoringFabricId, tailoring_fabric_item_id as tailoringFabricItemId,client_abbreviation as clientAbbreviation
+ memo, sort, ready_fabric as readyFabric, tailoring_fabric_id as tailoringFabricId, GROUP_CONCAT(tailoring_fabric_item_id) as tailoringFabricItemId,client_abbreviation as clientAbbreviation
  FROM sy_shipping_order_item where del_flag = 0 and sy_shipping_order_item_id = #{id}
 group by group_id
     </select>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/service/impl/SyShippingOrderServiceImpl.java

@@ -238,7 +238,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                         syShippingOrderItem.setCreateTime(sf.parse(createTime));
 
                         syShippingOrderItem.setGroupId(lit.getGroupId());//分组ID
-                        syShippingOrderItem.setNumber(lit.getPlanQuantity());//数量
+                        syShippingOrderItem.setNumber(lit.getPiecesBox());//数量
                         syShippingOrderItem.setBoxNumber(lit.getBoxNumber());//箱数
                         syShippingOrderItem.setId(oConvertUtils.id());
                         syShippingOrderItem.setSyShippingOrderItemId(id);