Merge branch 'dev' into pre-production

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesAbnormalPackageController.java

@@ -16,6 +16,8 @@
  */
 package com.logpm.aftersales.controller;
 
+import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
+import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -61,6 +63,9 @@ public class AftersalesAbnormalPackageController extends BladeController {
 
 	private final IAftersalesAbnormalPackageService aftersalesAbnormalPackageService;
 
+
+	private final IBasicdataWarehouseClient warehouseClient;
+
 	/**
 	 * 异常处理包件记录 详情
 	 */
@@ -88,7 +93,11 @@ public class AftersalesAbnormalPackageController extends BladeController {
 	@GetMapping("/getAbnormalPackage")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "查询包件是否处理过的信息", notes = "传入aftersalesAbnormalPackage")
-	public R<List<AftersalesAbnormalPackageVO>> getAbnormalPackage(@ApiIgnore @RequestParam Map<String, Object> aftersalesAbnormalPackage, Query query) {
+	public R getAbnormalPackage(@ApiIgnore @RequestParam Map<String, Object> aftersalesAbnormalPackage, Query query) {
+		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+		if (Func.isEmpty(myCurrentWarehouse)){
+			return R.fail(403,"未授权!!!");
+		}
 		log.info("查询包件的数据》》》{}",aftersalesAbnormalPackage);
 		List<AftersalesAbnormalPackageVO> pages = aftersalesAbnormalPackageService.getAbnormalPackage( aftersalesAbnormalPackage,Condition.getPage(query));
 		return R.data(pages);

blade-service/logpm-business/Dockerfile

@@ -0,0 +1,16 @@
+FROM 192.168.2.110:7777/hwy/hwy_base:v1.0
+
+MAINTAINER h5u@163.com
+
+RUN mkdir -p /logpm/business
+
+WORKDIR /logpm/business
+
+EXPOSE 8600
+
+ADD ./target/logpm-business.jar ./app.jar
+
+ENV JAVA_OPTS="-Xms512m -Xmx1024m"
+
+ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "-Xms128m","-Xmx512m","app.jar"]
+CMD ["--spring.profiles.active=test"]

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java

@@ -239,6 +239,13 @@ public interface DistributionParcelListMapper extends BaseMapper<DistributionPar
 	 */
 	List<DistributionParcelListNodeVO> selectPackagePlanBillLading(@Param("orderPackageCode")String orderPackageCode,@Param("warehouseId") Long warehouseId);
 
+	/**
+	 * 查询自提包件计划记录
+	 * @param orderPackageCode
+	 * @param id
+	 * @return
+	 */
+
 
 	/**
 	 * 查询自提签收扫描记录

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml

@@ -1427,7 +1427,7 @@
         ldpl.quantity AS quantity,
         ldpl.train_number AS tranNumber,
         ldpl.waybill_number AS waybillNumber,
-        ldrp.create_time AS nodeTime,
+        ldrp.update_time AS nodeTime,
         ldrp.create_user AS nodeControlsUserId,
         '配送取消' AS nodeName,
         lwt.pallet_name,

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -808,15 +808,16 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					if (shangpeiFlag) {
 						List<DistributionReservationEntity> reservationEntities = reservationEntityList.stream().filter(r -> r.getReceivingUnit().equals(stockArticleEntity.getConsigneeUnit()) && r.getMallName().equals(stockArticleEntity.getMallName()) && r.getId().equals(distrilbutionloadingscanDTO.getReservationId())).collect(Collectors.toList());
 						//查询是否满足商配异常装车
-						boolean flag = reservationEntityList.stream().anyMatch(r -> r.getReceivingUnit().equals(stockArticleEntity.getConsigneeUnit()) && r.getMallName().equals(stockArticleEntity.getMallName()));
+						boolean flag = reservationEntities.stream().anyMatch(r -> r.getReceivingUnit().equals(stockArticleEntity.getConsigneeUnit()) && r.getMallName().equals(stockArticleEntity.getMallName()));
-						if (reservationEntities.size() == 1) {
+						if (flag){
-							if (Func.isEmpty(distrilbutionloadingscanDTO.getReservationId())) {
+							return R.fail(5000, "异常装车");
-								log.info("异常装车未指定客户");
+
+						}else {
+							if (Func.isEmpty(distrilbutionloadingscanDTO.getReservationId())){
 								return Resp.scanFail("请指定客户进行异常装车", "请指定客户进行异常装车");
+							}else {
+								return Resp.scanFail("窜货", "窜货");
 							}
-							return R.fail(5000, "异常装车");
-						} else {
-							return Resp.scanFail("窜货", "窜货");
 						}
 					} else {
 						log.error("配送计划预约类型错误:{}", reservationEntityList);

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java

@@ -1569,7 +1569,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 						BeanUtils.copyProperties(i, billPackageEntity);
 						billPackageEntity.setBillLadingId(distrilbutionBillLading.getId());
 						billPackageEntity.setPacketNumber(1);
-						billPackageEntity.setPacketBarStatus(1);
+						billPackageEntity.setPacketBarStatus(3);
 						billPackageEntity.setBillType("1");
 						packageEntityList.add(billPackageEntity);
 						finalPackageIds.add(i.getParceListId());

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml

@@ -5,6 +5,7 @@
     <select id="getDetailsPage" resultType="com.logpm.report.vo.BillLoadingDetailsVO">
         select pickup_batch,
                warehouse,
+               warehouse_id,
                consignee_unit,
                waybill_number,
                order_code,
@@ -24,6 +25,7 @@
             examine_user
         from (select dbl.pickup_batch,
             dsa.warehouse,
+            dsa.warehouse_id,
             dsa.consignee_unit,
             dsa.waybill_number,
             dsa.order_code,
@@ -97,6 +99,7 @@
     <select id="getTasksPage" resultType="com.logpm.report.vo.BillLoadingTasksVO">
         select pickup_batch,
                warehouse,
+               warehouse_id,
                waybill_number,
                order_code,
                consigneeUnit,
@@ -120,6 +123,7 @@
                createdTime
         from (select obj.pickup_batch,
                      lww.name       as            warehouse,
+                     lww.id       as            warehouse_id,
                      ldsa.waybill_number,
                      ldsa.order_code,
                      ldsa.mall_name               consigneeUnit,

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml

@@ -202,6 +202,7 @@
         stock_article_id,
         task_time,
         warehouse_name,
+        warehouse_id,
         receiving_unit,
         mall_name,
         consignee,
@@ -231,6 +232,7 @@
         stockarticle.code                 stock_article_id,
         lddl.task_time                    task_time,
         lddl.warehouse_name               warehouse_name,
+        lddl.warehouse_id               warehouse_id,
         obj.receiving_unit                receiving_unit,
         obj.mall_name                     mall_name,
         obj.consignee,
@@ -307,6 +309,7 @@
         reservation_code,
         task_time,
         warehouse_name,
+        warehouse_id,
         type,
         kind,
         vehicle_name,
@@ -350,6 +353,7 @@
         obj.reservation_code reservation_code,
         obj.reservation_date task_time,
         dpl.warehouse warehouse_name,
+        dpl.warehouse_id warehouse_id,
         CASE
         WHEN obj.delivery_type = 1 THEN
         '商配'
@@ -473,6 +477,7 @@
         reservation_code,
         task_time,
         warehouse_name,
+        warehouse_id,
         type,
         kind,
         vehicle_name,
@@ -517,6 +522,7 @@
         obj.reservation_code reservation_code,
         obj.reservation_date task_time,
         dpl.warehouse warehouse_name,
+        dpl.warehouse warehouse_id,
         CASE
         WHEN obj.delivery_type = 1 THEN
         '商配'
@@ -645,6 +651,7 @@
                mall_name,
                description_goods,
                warehouse,
+               warehouse_id,
                warehouse_entry_time,
                warehouse_entry_time_end,
                store_time,
@@ -679,6 +686,7 @@
                      ldsa.mall_name,
                      ldsa.description_goods,
                      ldsa.warehouse,
+                     ldsa.warehouse_id,
                      ldsa.warehouse_entry_time,
                      ldsa.warehouse_entry_time_end,
                      ldsa.store_time,

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportStockMapper.xml

@@ -3,7 +3,9 @@
 <mapper namespace="com.logpm.report.mapper.ReportStockMapeer">
 
     <select id="getDetailPage" resultType="com.logpm.report.vo.StockDetailsVO">
-        select warehouse_name,
+        select
+        warehouse_name,
+        warehouse_id,
                market_name,
                service_type,
                cargo_number,
@@ -14,7 +16,9 @@
                quantity_occupied,
                usable_quantity,
                allocation_title
-        from (select t.warehouse_name,
+        from (select
+        t.warehouse_name,
+        t.warehouse_id,
                      t.market_name,
                      case
                          when t.service_type = '1' then '商配'
@@ -39,7 +43,9 @@
             ${ew.customSqlSegment}
     </select>
     <select id="getInStocks" resultType="com.logpm.report.vo.ReportInStockVO">
-        select warehouse_name,
+        select
+        warehouse_name,
+        warehouse_id,
                market_name,
                service_type,
                cargo_number,
@@ -50,7 +56,9 @@
                package_code,
                quantity_stock,
                allocation_title
-        from (select t.warehouse_name,
+        from (select
+        t.warehouse_name,
+        t.warehouse_id,
                      t.market_name,
                      t.service_type         service_type,
                      t.cargo_number,
@@ -73,7 +81,9 @@
              ) t ${ew.customSqlSegment}
     </select>
     <select id="getOutStocks" resultType="com.logpm.report.vo.ReportOutStockVO">
-        select warehouse_name,
+        select
+        warehouse_name,
+        warehouse_id,
                market_name,
                cargo_number,
                material_name,
@@ -85,7 +95,9 @@
                train_number,
                reservation_code,
                client_name
-        from (select ldsl.warehouse_name,
+        from (select
+        ldsl.warehouse_name,
+        ldsl.warehouse_id,
                      ldsl.market_name,
                      ldsl.cargo_number,
                      ldsl.description_goods                                                material_name,

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml

@@ -22,7 +22,8 @@
                si.objection_remark objectionRemark,
                si.create_time createTime,
                si.create_dept createDept,
-               si.create_user createUser
+               si.create_user createUser,
+                si.remark
         from sup_indicators si
         left join sup_classify sc on sc.id = si.classify_id
         left join sup_classify psc on psc.id = sc.p_id