diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java index 597e85090..3aa2fc6a5 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java @@ -62,7 +62,7 @@ public class BasicdataDriverArteryEntity extends TenantEntity { /** * 职务类型;1-干线,2-配送 */ - @ApiModelProperty(value = "职务类型;1-干线,2-配送,3-全部") + @ApiModelProperty(value = "职务类型;1-干线,2-配送") private String jobType; /** * 准驾车型;1-A1,2-A2,3-A3,4-B1,5-B2,6-C1,7-C2 diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataDriverArteryVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataDriverArteryVO.java index 72de2c0ae..894f8754f 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataDriverArteryVO.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataDriverArteryVO.java @@ -50,6 +50,12 @@ public class BasicdataDriverArteryVO extends BasicdataDriverArteryEntity { @ApiModelProperty(value = "司机关联车辆列表") private List vehicleVOList; + /** + * 司机类型 + */ + private List jobTypeString; + + private List warehouses = new ArrayList<>(); diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java index 178ea743d..584ac8f4c 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java @@ -81,6 +81,7 @@ public class LoadCarsDTO implements Serializable { private List orderCodes; + private List orderCodeList; private Integer enterNum; diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenLabelDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenLabelDTO.java index 7fb78a042..f8b061a80 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenLabelDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenLabelDTO.java @@ -34,6 +34,8 @@ public class OpenLabelDTO implements Serializable { private BigDecimal volume; + private String materialName; + private String dealerCode; private String dealerName; diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/ZeroSuppleVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/ZeroSuppleVO.java index 4decd1cdb..5302f0a09 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/ZeroSuppleVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/ZeroSuppleVO.java @@ -12,6 +12,7 @@ public class ZeroSuppleVO implements Serializable { private String orderCode; private Integer enterNum;//输入数量 private Long finalNodeId;//目的仓id + private Long signOrderId;//签收单id } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java index 34a572b6d..67e8fbbd2 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java @@ -34,6 +34,7 @@ import com.logpm.basicdata.vo.BasicdataDriverWarehouseVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; +import jodd.util.ArraysUtil; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.boot.ctrl.BladeController; @@ -54,10 +55,7 @@ import springfox.documentation.annotations.ApiIgnore; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 司机信息表 控制器 @@ -95,6 +93,11 @@ public class BasicdataDriverArteryController extends BladeController { List warehouseIds = basicdataDriverWarehouseService.findByDriverId(driverId); BasicdataDriverArteryVO basicdataDriverArteryVO = new BasicdataDriverArteryVO(); BeanUtil.copy(detail,basicdataDriverArteryVO); + + // 拆分 司机类型 + String[] split = basicdataDriverArteryVO.getJobType().split(","); + List list = Arrays.asList(split); + basicdataDriverArteryVO.setJobTypeString(list); basicdataDriverArteryVO.setWarehouses(warehouseIds); basicdataDriverArteryVO.setBindVehicles(String.join(",",vehicleIds)); return R.data(basicdataDriverArteryVO); diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataDriverArteryDTO.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataDriverArteryDTO.java index 27c8f85c0..b5ab2870f 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataDriverArteryDTO.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataDriverArteryDTO.java @@ -41,4 +41,6 @@ public class BasicdataDriverArteryDTO extends BasicdataDriverArteryEntity { private String bindVehicles; private List warehouseIds = new ArrayList<>(); + + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCodeRecordMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCodeRecordMapper.java index 69d362927..79af10590 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCodeRecordMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCodeRecordMapper.java @@ -7,5 +7,5 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface BasicdataCodeRecordMapper extends BaseMapper { - BasicdataCodeRecordEntity findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(@Param("type") Integer type, @Param("warehouseCode") String warehouseCode, @Param("year") String year, @Param("month") String month,@Param("day") String day); + BasicdataCodeRecordEntity findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(@Param("type") Integer type, @Param("warehouseCode") String warehouseCode, @Param("year") String year, @Param("month") String month); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCodeRecordMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCodeRecordMapper.xml index 67783327a..c830f2a2e 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCodeRecordMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCodeRecordMapper.xml @@ -10,7 +10,6 @@ and warehouse_code = #{warehouseCode} and `year` = #{year} and `month` = #{month} - and `day` = #{day} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.java index dd5cbf1ab..e4112f933 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.java @@ -69,7 +69,7 @@ public interface BasicdataDriverArteryMapper extends BaseMapper selectListByWarehouseId(@Param("warehouseId") Long warehouseId); + List selectListByWarehouseId(@Param("warehouseId") Long warehouseId,@Param("jobType")String jobType); BasicdataDriverArteryEntity findEntityByPhone(@Param("phone") String phone); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.xml index b15895d84..fee6fa8be 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.xml @@ -168,13 +168,12 @@ left join logpm_basicdata_vehicle lbv on lbv.id = lbdm.brand_id where lbda.`name` like concat('%',#{driverName},'%') - and lbda.job_type = #{jobType} + and locate(#{jobType},lbda.job_type)>0 group by lbda.id, lbda.name, lbda.phone, lbda.type - limit 10 diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataFactoryCategoryMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataFactoryCategoryMapper.xml index 13cae408e..a4cf140eb 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataFactoryCategoryMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataFactoryCategoryMapper.xml @@ -39,9 +39,6 @@ and type = #{param.type} - - and category = #{param.category} - and (firsts is null or firsts = '') @@ -60,6 +57,12 @@ and thirds = #{param.thirds} + + and (materiel_name is null or materiel_name = '') + + + and materiel_name = #{param.materielName} + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCodeRecordService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCodeRecordService.java index 3544353e7..3cbf815e6 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCodeRecordService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCodeRecordService.java @@ -4,5 +4,5 @@ import com.logpm.basicdata.entity.BasicdataCodeRecordEntity; import org.springblade.core.mp.base.BaseService; public interface IBasicdataCodeRecordService extends BaseService { - BasicdataCodeRecordEntity findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(Integer type, String warehouseCode, String year, String month,String day); + BasicdataCodeRecordEntity findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(Integer type, String warehouseCode, String year, String month); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeRecordServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeRecordServiceImpl.java index f35f9d17e..e1fef9497 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeRecordServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeRecordServiceImpl.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; @AllArgsConstructor public class BasicdataCodeRecordServiceImpl extends BaseServiceImpl implements IBasicdataCodeRecordService { @Override - public BasicdataCodeRecordEntity findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(Integer type, String warehouseCode, String year, String month,String day) { - return baseMapper.findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(type,warehouseCode,year,month,day); + public BasicdataCodeRecordEntity findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(Integer type, String warehouseCode, String year, String month) { + return baseMapper.findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(type,warehouseCode,year,month); } } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java index 6fe073e11..bbaf61501 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java @@ -7,7 +7,6 @@ import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.service.IBasicdataCodeRecordService; import com.logpm.basicdata.service.IBasicdataCodeService; import com.logpm.basicdata.service.IBasicdataWarehouseService; -import io.swagger.models.auth.In; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springblade.common.constant.CodeDesEnum; @@ -137,6 +136,8 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService { //包条 HT+仓库拼音/超管/职能+年月日时分秒+订单索引+包条个数索引CodeNumConstant.PACKAGE BasicdataCodeRecordEntity basicdataCodeRecordEntity = getBasicdataCodeRecordEntity(CodeDesEnum.PACKAGE.getCodeNum(), basicdataWarehouseEntity); + Calendar calendar = Calendar.getInstance(); + Integer day = calendar.get(Calendar.DAY_OF_MONTH); Integer oldNum = basicdataCodeRecordEntity.getNum(); List packageCodes = new ArrayList<>(); @@ -151,7 +152,7 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService { String time = new String(System.currentTimeMillis() + ""); time=time.substring(4); oldNum = oldNum + 1; - String packageCode = "HT" + warehouseCode + year + CommonUtil.geFourNumberByString(basicdataCodeRecordEntity.getMonth(), 2) + basicdataCodeRecordEntity.getDay() + time; + String packageCode = "HT" + warehouseCode + year + CommonUtil.geFourNumberByString(basicdataCodeRecordEntity.getMonth(), 2) + day + time; packageCodes.add(packageCode); } basicdataCodeRecordEntity.setNum(oldNum); @@ -201,9 +202,9 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService { // 获取月份（注意月份从0开始计数） Integer month = calendar.get(Calendar.MONTH) + 1; - Integer day = calendar.get(Calendar.DAY_OF_MONTH); +// Integer day = calendar.get(Calendar.DAY_OF_MONTH); - BasicdataCodeRecordEntity basicdataCodeRecordEntity = basicdataCodeRecordService.findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(type, basicdataWarehouseEntity.getWarehouseCode(), year + "", month + "", day + ""); + BasicdataCodeRecordEntity basicdataCodeRecordEntity = basicdataCodeRecordService.findEntityByCodeTypeAndWarehouseCodeAndYearAndMonth(type, basicdataWarehouseEntity.getWarehouseCode(), year + "", month + ""); if (Objects.isNull(basicdataCodeRecordEntity)) { basicdataCodeRecordEntity = new BasicdataCodeRecordEntity(); @@ -213,7 +214,7 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService { basicdataCodeRecordEntity.setWarehouseCode(basicdataWarehouseEntity.getWarehouseCode()); basicdataCodeRecordEntity.setYear(year + ""); basicdataCodeRecordEntity.setMonth(month + ""); - basicdataCodeRecordEntity.setDay(day + ""); +// basicdataCodeRecordEntity.setDay(day + ""); basicdataCodeRecordEntity.setNum(0); basicdataCodeRecordService.save(basicdataCodeRecordEntity); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java index 73c263bd4..07bad0f82 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java @@ -140,7 +140,7 @@ public class BasicdataDriverArteryServiceImpl extends BaseServiceImpl basicdataDriverArteryVOS = new ArrayList<>(); - List list = baseMapper.selectListByWarehouseId(warehouseId); + List list = baseMapper.selectListByWarehouseId(warehouseId,"2"); log.info("################getDriverList list:{}", list); if(list.isEmpty()){ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java index e9fefd3cd..e557e20cf 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java @@ -400,7 +400,7 @@ public class DistributionDeliveryListController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "customArgs") public R getDeliveryZeroOrderDetail(@ApiIgnore @RequestParam Long deliveryId,@RequestParam Long orderId) { - R parcelNumberVOS = distributionDeliveryListService.getDeliveryZeroOrderDetail(deliveryId, orderId); + List parcelNumberVOS = distributionDeliveryListService.getDeliveryZeroOrderDetail(deliveryId, orderId); return R.data(parcelNumberVOS); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index 1beb630e9..366294c04 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -1083,6 +1083,8 @@ LEFT JOIN logpm_distribution_stock_list AS ldsl ON ldrs.stocklist_id = ldsl.id WHERE lds.id = #{id} AND lds.is_deleted = 0 + GROUP BY + ldrs.stocklist_id diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java index dd001f79a..b49e0ad78 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java @@ -230,15 +230,17 @@ public class InComingServiceImpl implements IInComingService { if(incomingType == 1 || incomingType == 2){ for (TrunklineAdvanceDetailEntity trunklineAdvanceDetailEntity : advanceDetailEntityList) { - Long warehouseId1 = trunklineAdvanceDetailEntity.getWarehouseId(); - if(!warehouseId1.equals(warehouseId)){ - log.warn("############incomingPackage: 包件数据不在当前仓 packageCodes={} warehouseId={}", packageCodes, warehouseId); - return Resp.scanFail(405, "包件数据不在当前仓", "包件数据不在当前仓"); + String packageStatus = trunklineAdvanceDetailEntity.getPackageStatus(); + if("0".equals(packageStatus)){ + Long warehouseId1 = trunklineAdvanceDetailEntity.getWarehouseId(); + if(!warehouseId1.equals(warehouseId)){ + log.warn("############incomingPackage: 包件数据不在当前仓 packageCodes={} warehouseId={}", packageCodes, warehouseId); + return Resp.scanFail(405, "包件数据不在当前仓", "包件数据不在当前仓"); + } } } } - if(StringUtil.isNotBlank(customerTrain)){ for (TrunklineAdvanceDetailEntity advanceDetailEntity : advanceDetailEntityList) { String trainNumber = advanceDetailEntity.getTrainNumber(); @@ -344,9 +346,9 @@ public class InComingServiceImpl implements IInComingService { map.put("warehouseId", warehouseId); map.put("orderPackageCode", packageCode); R r = warehouseTrayTypeClient.orderScanOrderPackageCodeReturnR(map); - Object data = r.getData(); - if(!Objects.isNull(data)){ - audio.set((String) data); + int code = r.getCode(); + if(code != 200){ + audio.set(r.getMsg()); } } }); @@ -442,9 +444,9 @@ public class InComingServiceImpl implements IInComingService { map.put("warehouseId", warehouseId); map.put("orderPackageCode", packageCode); R r = warehouseTrayTypeClient.orderScanOrderPackageCodeReturnR(map); - Object data = r.getData(); - if(!Objects.isNull(data)){ - audio.set((String) data); + int code = r.getCode(); + if(code != 200){ + audio.set(r.getMsg()); } } }); @@ -495,7 +497,7 @@ public class InComingServiceImpl implements IInComingService { String a = audio.get(); if(StringUtil.isNotBlank(a)){ - return Resp.scanSuccess("入库成功",a); + return Resp.scanFail(405,a,a); } return R.success("入库成功"); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index b44fc2e00..3a54cd6c0 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -797,15 +797,16 @@ public class OpenOrderServiceImpl implements IOpenOrderService { } //异步存入日志 + Date date = new Date(); String nickName = AuthUtil.getNickName(); Long userId = AuthUtil.getUserId(); - String createOperationRemark = "创建运单" + waybillNo + ",时间：" + CommonUtil.dateToStringGeneral(new Date()); + String createOperationRemark = "创建运单" + waybillNo + ",时间：" + CommonUtil.dateToStringGeneral(date); openOrderAsyncService.saveLog(waybillId, waybillNo, "10", "创建运单", createOperationRemark, nickName, userId, warehouseId, warehouseName); Integer totalCount = waybillEntity.getTotalCount(); Integer stockCount = waybillEntity.getStockCount(); if (totalCount.equals(stockCount)) { - createOperationRemark = "运单入库：" + stockCount + "/" + totalCount + ",入库类型：【零担开单及入库】,入库时间：" + CommonUtil.dateToStringGeneral(waybillEntity.getCreateTime()); + createOperationRemark = "运单入库：" + stockCount + "/" + totalCount + ",入库类型：【零担开单及入库】,入库时间：" + CommonUtil.dateToStringGeneral(date); openOrderAsyncService.saveLog(waybillId, waybillNo, "20", "已入库", createOperationRemark, nickName, userId, warehouseId, warehouseName); } @@ -1070,7 +1071,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { advanceEntity.setCustomerName(openLabelDTO.getCustomerName()); advanceEntity.setCustomerPhone(openLabelDTO.getCustomerPhone()); advanceEntity.setCustomerAddress(openLabelDTO.getCustomerAddress()); - advanceEntity.setSystemType("线上"); + advanceEntity.setSystemType("线下"); advanceEntity.setServiceNum(openLabelDTO.getServiceNum()); advanceEntity.setMatingType("1"); advanceEntity.setSenderName(openLabelDTO.getSenderName()); @@ -1089,7 +1090,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { advanceDetailModel.setAdvanceId(advanceId); advanceDetailModel.setOrderCode(openLabelDTO.getOrderCode()); advanceDetailModel.setBrand(openLabelDTO.getBrand()); - advanceDetailModel.setSystemType("线上"); + advanceDetailModel.setSystemType("线下"); // advanceDetailModel.setOrderPackageCode(basicdataCodeClient.getCodeByType(CodeNumConstant.PACKAGE, warehouseCode, orderCode)); advanceDetailModel.setFirstPackName(firsts); @@ -1106,6 +1107,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { advanceDetailModel.setThirdPackName(thirds); } advanceDetailModel.setSiteName(openLabelDTO.getSiteName()); + advanceDetailModel.setMaterialName(openLabelDTO.getMaterialName()); advanceDetailModel.setQuantity(1); advanceDetailModel.setServiceNum(openLabelDTO.getServiceNum()); advanceDetailModel.setPackageStatus("0"); @@ -1383,7 +1385,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String materialName = pacakgeDetailExcelDTO.getMaterialName(); String materialCode = pacakgeDetailExcelDTO.getMaterialCode(); - + advanceDetailModel.setMaterialName(materialName); + advanceDetailModel.setMaterialCode(materialCode); if (StringUtil.isNotBlank(materialCode) && StringUtil.isNotBlank(materialName)) { Long materialId = materialMap.get(materialCode); if (!Objects.isNull(materialId)) { diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java index 8bc0cc346..ddcc1bdd6 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java @@ -300,7 +300,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl billladingWaybillEntities = billladingWaybillService.findNoFinishWaybillByBillladingId(billladingId); Map map = new HashMap<>(); @@ -480,7 +480,7 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl 0 ){ +// signOrderEntity.setSignStatus("10"); +// } +// trunklineLoadSignOrderService.updateById(signOrderEntity); + } } //更新数量 updateNumByLoadId(loadId); @@ -5223,10 +5242,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl num){ + log.warn("##############signScanPackageCode: 签收数量不能大于当前数据的装车数量 num={} enterNum={}", num, enterNum); + return R.fail(405, "签收数量不能大于当前数据的装车数量"); + } + carsLoadScanEntity.setScanStatus("3"); carsLoadScanEntity.setUnloadNum(enterNum); carsLoadScanEntity.setUnloadAbnormal(0); @@ -5997,11 +6022,27 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("sign_order_id",signOrderId) + .eq("type",2) + .eq("scan_status","3"); - + List carsLoadScanEntityList = trunklineCarsLoadScanService.list(queryWrapper); + carsLoadScanEntityList.forEach(carsLoadScanEntity -> { + Integer num = carsLoadScanEntity.getNum(); + Integer unloadNum = carsLoadScanEntity.getUnloadNum(); + String orderCode = carsLoadScanEntity.getOrderCode(); + Long fromWarehouseId = carsLoadScanEntity.getFromWarehouseId(); + if(unloadNum != num){ + int diff = num - unloadNum; + DistributionStockArticleEntity stockArticle = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(orderCode, fromWarehouseId); + distributionStockArticleClient.addHandQuantity(stockArticle.getId(), diff); + } + }); + trunklineLoadSignOrderService.updateById(signOrderEntity); } - - return R.success("添加成功"); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java index 48de8a587..3e295c2c1 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java @@ -3364,8 +3364,8 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl list = warehouseTrayGoodsService.findAllPackageDetailByOrderCode(orderCode,warehouseId); for (ParcelListVO parcelListVO:list){ - String trayName = parcelListVO.getTrayName(); - if(trayCode.equals(trayName)){ + String trayCode1 = parcelListVO.getTrayCode(); + if(trayCode.equals(trayCode1)){ parcelListVO.setDeletedStatus(1); }else{ parcelListVO.setDeletedStatus(0);