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

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/BillladingDTO.java

@@ -53,7 +53,7 @@ public class BillladingDTO extends TrunklineBillladingEntity {
 	private String consignee;//收货单位
 	private String remark;//备注
 	private String destinationWarehouseName;//目的仓
+	private String completeTime;//目的仓
 
 	private Long billladingId;
-
 }

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

@@ -9,6 +9,7 @@ import java.util.List;
 @Data
 public class TrunklineLoadSignOrderVO extends TrunklineLoadSignOrderEntity {
 
+	private String warehouseName;
 	private String driverName;
 	private String carsNo;
 	private String carsLineName;

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/BillladingController.java

@@ -277,6 +277,7 @@ public class BillladingController {
 		//提货单状态 1=未开始，2=提货中，3=已完成，4=已结算 5=已取消
 		Integer type = billladingDTO.getType();
 		Long billladingId = billladingDTO.getId();
+		String completeTime = billladingDTO.getCompleteTime();
 		try{
 
 			//当前登录人选择的仓库
@@ -295,7 +296,7 @@ public class BillladingController {
 				return R.fail(405,"提货单id不能为空");
 			}
 
-			trunklineBillladingService.updateBillladingStatus(billladingId,type,myCurrentWarehouse.getId(),myCurrentWarehouse.getName());
+			trunklineBillladingService.updateBillladingStatus(billladingId,type,myCurrentWarehouse.getId(),myCurrentWarehouse.getName(),completeTime);
 			return R.success("更新完成");
 		}catch (CustomerException e){
 			log.error(e.message,e);

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java

@@ -2405,6 +2405,7 @@ public class CarsLoadController {
 			}else{
 				warehouseIds.add(myCurrentWarehouse.getId());
 			}
+			loadCarsDTO.setWarehouseIds(warehouseIds);
 
 			return carsLoadService.findSignOrderPageList(loadCarsDTO);
 		}catch (CustomerException e){

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

@@ -118,9 +118,17 @@
         select ltlso.id id,
         ltlso.load_id loadId,
         ltlso.warehouse_id warehouseId,
+        lww.warehouse_name warehouseName,
         ltlso.plan_num planNum,
         ltlso.load_sign_code loadSignCode,
         ltlso.sign_num signNum,
+        ltlso.mall_name mallName,
+        ltlso.mall_person mallPerson,
+        ltlso.mall_mobile mallMobile,
+        ltlso.mall_address mallAddress,
+        ltlso.belong_to_warehouse_name belongToWarehouseName,
+        ltlso.sign_status signStatus,
+        ltlso.sign_time signTime,
         ltcl.driver_name driverName,
         ltcl.driver_mobile driverMobile,
         ltcl.car_number carNumber,
@@ -130,6 +138,7 @@
         from logpm_trunkline_load_sign_order ltlso
         left join logpm_trunkline_cars_load ltcl on ltcl.id = ltlso.load_id
         LEFT JOIN logpm_trunkline_cars_order ltco on ltco.sign_order_id = ltlso.id
+        left join logpm_warehouse_warehouse lww on lww.id  = ltlso.warehouse_id
         <where>
 
             and (ltlso.warehouse_id in

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineBillladingService.java

@@ -22,7 +22,7 @@ public interface ITrunklineBillladingService extends BaseService<TrunklineBillla
 
 	void updateBilllading(BillladingDTO billladingDTO);
 
-	void updateBillladingStatus(Long billladingId, Integer type,Long warehouseId,String warehouseName);
+	void updateBillladingStatus(Long billladingId, Integer type,Long warehouseId,String warehouseName,String completeTime);
 
 	R billladingDetail(Long billladingId, Long warehouseId);
 

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@@ -1828,6 +1828,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			updateMaterialEntity.setId(advanceDetailEntity.getId());
 			updateMaterialEntity.setMaterialCode(importStandardOuPaiDTO.getMaterialCode());
 			updateMaterialEntity.setMaterialName(importStandardOuPaiDTO.getMaterialName());
+			updateMaterialEntity.setFirstPackName(importStandardOuPaiDTO.getFirstsName());
+			updateMaterialEntity.setSecondPackName(importStandardOuPaiDTO.getSencodsName());
+			updateMaterialEntity.setThirdPackName(importStandardOuPaiDTO.getThirdsName());
 			updateMaterialList.add(updateMaterialEntity);
 		});
 

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java

@@ -382,7 +382,7 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 	}
 
 	@Override
-	public void updateBillladingStatus(Long billladingId, Integer type,Long warehouseId,String warehouseName) {
+	public void updateBillladingStatus(Long billladingId, Integer type,Long warehouseId,String warehouseName,String completeTime) {
 		log.info("#############updateBillladingStatus: 更新提货单状态 type={}",type);
 
 		TrunklineBillladingEntity billladingEntity = baseMapper.selectById(billladingId);
@@ -418,7 +418,7 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 					//提货完成
 					if ("2".equals(billladingStatus)) {
 						billladingEntity.setBillladingStatus("3");
-						billladingEntity.setEndTime(new Date());
+						billladingEntity.setEndTime(CommonUtil.StringToDate(completeTime));
 						stringBuffer.append(",提货中变更为提货完成");
 					} else {
 						log.warn("##################updateBillladingStatus: 提货单不能更新为已完成 billladingStatus={}", billladingStatus);

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillPackageServiceImpl.java

@@ -174,11 +174,15 @@ public class TrunklineWaybillPackageServiceImpl extends BaseServiceImpl<Trunklin
 				//更新所有包件的当前所在仓
 				if(CollUtil.isNotEmpty(orderPackageCodes)){
 					List<TrunklineAdvanceDetailEntity> advanceDetailEntities = advanceDetailService.findListByOrderPackageCodeList(orderPackageCodes);
+					List<TrunklineAdvanceDetailEntity> updateAdvanceDetailList = new ArrayList<>();
 					advanceDetailEntities.forEach(advanceDetailEntity -> {
-						advanceDetailEntity.setNowWarehouseId(warehouseId);
+						TrunklineAdvanceDetailEntity updateAdvanceDetail = new TrunklineAdvanceDetailEntity();
-						advanceDetailEntity.setNowWarehouseName(warehouseEntity.getName());
+						updateAdvanceDetail.setId(advanceDetailEntity.getId());
+						updateAdvanceDetail.setNowWarehouseId(warehouseId);
+						updateAdvanceDetail.setNowWarehouseName(warehouseEntity.getName());
+						updateAdvanceDetailList.add(updateAdvanceDetail);
 					});
-					advanceDetailService.updateBatchById(advanceDetailEntities);
+					advanceDetailService.updateBatchById(updateAdvanceDetailList);
 				}
 			}
 		}