Merge remote-tracking branch 'origin/dev' into pre-production

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/SignPackageVO.java

@@ -16,6 +16,9 @@ public class SignPackageVO implements Serializable {
 	private String scanStatus;
 	private String orderCode;
 	private String waybillNo;
+	private String firstName;
+	private String secondName;
+	private String thirdName;
 
 	private List<TrunklineScanZeroDetailVO> scanZeroDetailList = new ArrayList<>();
 

blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/service/impl/DeliveryNoteServiceImpl.java

@@ -194,7 +194,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 			advanceEntity.setTenantId(tenantId);
 			advanceEntity.setStatus(0);
 			advanceEntity.setIsDeleted(0);
-			advanceEntity.setHasPackage(CollUtil.isNotEmpty(boxCodes) ? 1 : 0);
+			advanceEntity.setHasPackage(1);
 			advanceEntity.setOrderType("");
 			advanceEntity.setBrand(BrandEnums.JP.getValue());
 			advanceEntity.setSiteName(vo.getOrgName());
@@ -252,6 +252,12 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 			if (StrUtil.isNotEmpty(goodsVolume)) {
 				volume = new BigDecimal(goodsVolume);
 			}
+			// 如果有数量没有包条码，则生成系统包条
+			if(CollUtil.isEmpty(boxCodes)){
+				for (int i = 0; i < Convert.toInt(orderInfoVO.getGoodsNumber()); i++) {
+					boxCodes.add(orderInfoVO.getCustomItemNo() + "-" + (i+1));
+				}
+			}
 			int size = boxCodes.size();
 			int index = 0;
 			for (String packageCode : boxCodes) {

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml

@@ -1114,7 +1114,10 @@
                unload_num unloadNum,
                scan_status scanStatus,
                order_code orderCode,
-               waybill_no waybillNo
+               waybill_no waybillNo,
+               firsts firstName,
+               senconds secondName,
+               thirds thirdName
         from logpm_trunkline_cars_load_scan
         where  sign_order_id = #{signOrderId}
     </select>