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

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/OrderCodeDataVO.java

@@ -19,5 +19,6 @@ public class OrderCodeDataVO {
 
 	@ApiModelProperty(value = "模板填充内容")
 	private List<Map<String,Object>> dataList;
+	private List<String> moldList;
 
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/OrderPackgeCodeDataVO.java

@@ -20,4 +20,6 @@ public class OrderPackgeCodeDataVO  {
 	@ApiModelProperty(value = "模板填充内容")
 	private List<Map> dataList;
 
+	private List<String> moldList;
+
 }

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

@@ -46,8 +46,6 @@ import com.logpm.distribution.vo.app.queryOrderVO;
 import com.logpm.distribution.wrapper.DistributionParcelListWrapper;
 import com.logpm.distribution.wrapper.DistributionStockArticleNewWrapper;
 import com.logpm.distribution.wrapper.DistributionStockArticleWrapper;
-import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity;
-import com.logpm.warehouse.entity.WarehouseUpdownGoodsEntity;
 import com.logpm.warehouse.feign.IWarehouseTrayGoodsClient;
 import com.logpm.warehouse.feign.IWarehouseUpdownGoodsClient;
 import lombok.AllArgsConstructor;
@@ -792,6 +790,17 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 
 		orderPackgeCodeDataVO.setDataList(data);
 
+		List<String> moldList = new ArrayList<>();
+		data.forEach(map -> {
+			try {
+				String popHtml = TemplateUtil.popTemplate("包件码", map, html);
+				moldList.add(popHtml);
+			} catch (Exception e) {
+				throw new RuntimeException(e);
+			}
+		});
+		orderPackgeCodeDataVO.setMoldList(moldList);
+
 		return orderPackgeCodeDataVO;
 	}
 
@@ -2471,6 +2480,18 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		}
 		orderCodeDataVO.setDataList(data);
 
+		List<String> moldList = new ArrayList<>();
+		data.forEach(map -> {
+			try {
+				String popHtml = TemplateUtil.popTemplate("订单码", map, html);
+				moldList.add(popHtml);
+			} catch (Exception e) {
+				throw new RuntimeException(e);
+			}
+		});
+		orderCodeDataVO.setMoldList(moldList);
+
+
 		return orderCodeDataVO;
 	}
 
@@ -2536,6 +2557,16 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		}
 		orderCodeDataVO.setDataList(data);
 
+		List<String> moldList = new ArrayList<>();
+		data.forEach(map -> {
+			try {
+				String popHtml = TemplateUtil.popTemplate("订单码", map, html);
+				moldList.add(popHtml);
+			} catch (Exception e) {
+				throw new RuntimeException(e);
+			}
+		});
+
 		return orderCodeDataVO;
 	}
 

blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/entity/PackageInfoEntity.java

@@ -25,6 +25,8 @@ public class PackageInfoEntity extends BaseEntity {
 	private String deliveryNoteId;
 	@ApiModelProperty(value = "订单号")
 	private String orderCode;
+	@ApiModelProperty(value = "单据编号")
+	private String billCode;
 	@ApiModelProperty(value = "已推送节点编码")
 	private Integer workedNodeCode;
 	@ApiModelProperty(value = "父项物料编码")

blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/mq/FactoryOrderListener.java

@@ -107,6 +107,7 @@ public class FactoryOrderListener {
 				orderInfoEntity.setLogId(ObjectUtil.isNotEmpty(logId) ? logId.toString() : null);
 				orderInfoEntity.setDeliveryNoteId(vo.getId().toString());
 				orderInfoEntity.setOrderCode(vo.getCustomizedBillCode());
+				orderInfoEntity.setBillCode(vo.getBillCode());
 				infoEntities.add(orderInfoEntity);
 			}
 			packageInfoService.saveBatch(infoEntities);

blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/mq/NodeDataPushListener.java

@@ -22,7 +22,6 @@ import com.logpm.factorydata.vo.PushData;
 import com.logpm.factorydata.vo.SendMsg;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.bouncycastle.util.Pack;
 import org.springblade.common.constant.WorkNodeEnums;
 import org.springblade.common.constant.factorydata.FactoryDataConstants;
 import org.springframework.amqp.core.ExchangeTypes;
@@ -142,6 +141,8 @@ public class NodeDataPushListener {
 					List<String> collect = value.stream().map(PushData::getPackageCode).collect(Collectors.toList());
 					// 5 根据订单号，包件码 查看数据是否齐套，齐套直接推送工厂
 					List<PackageInfoEntity> entities = packageInfoMap.get(orderCode);
+					PackageInfoEntity infoEntity = entities.get(0);
+					String billCode = infoEntity.getBillCode();
 					// 过滤掉entities 中的 workedNodeCode < code 的数据
 					List<PackageInfoEntity> workerList = entities.stream()
 						.filter(packageInfoEntity -> !collect.contains(packageInfoEntity.getBarcode()))
@@ -174,7 +175,7 @@ public class NodeDataPushListener {
 						}
 						// 推送工厂
 						JSONObject sendObj = new JSONObject();
-						sendObj.set("billCode", orderCode);
+						sendObj.set("billCode", billCode);
 						sendObj.set("status", factoryByNodeAndStatus.getText());
 						sendObj.set("packages", entities.stream().map(packageInfoEntity -> {
 							JSONObject jsonObject = new JSONObject();

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

@@ -464,10 +464,10 @@
           and ltcl.load_status != '0'
           and ltcl.load_type != '4'
         <if test="param.startTime != null">
-            and ltcl.start_time &gt;= #{param.startDate}
+            and ltcl.start_time &gt;= #{param.startTime}
         </if>
         <if test="param.endTime != null">
-            and ltcl.start_time &lt;= #{param.endDate}
+            and ltcl.start_time &lt;= #{param.endTime}
         </if>
     </select>
 

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

@@ -360,6 +360,7 @@
         select IFNULL(sum(unload_num),0)
         from logpm_trunkline_cars_load_scan
         where sign_order_id = #{signOrderId}
+        and scan_status = '3'
     </select>
 
     <update id="updateFinalNodeIdAndFinalNodeNameById">

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

@@ -4517,6 +4517,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			List<TrunklineCarsOrderEntity> carsOrderEntityList = trunklineCarsOrderService.listByIds(carsOrderIdList);
 			//移除carsOrderEntityList中signNum不为0的元素
 			carsOrderEntityList.removeIf(e -> e.getSignNum() != 0);
+			if(CollUtil.isNotEmpty(carsOrderEntityList)){
 				//把carsOrderEntityList通过signOrderId进行分组
 				Map<Long, List<TrunklineCarsOrderEntity>> collect = carsOrderEntityList.stream().collect(Collectors.groupingBy(TrunklineCarsOrderEntity::getSignOrderId));
 				Set<Long> signOrderIds = collect.keySet();
@@ -4588,6 +4589,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 						trunklineCarsLoadScanService.clearSignOrderIdByLoadIdAndWarehouseIdAndOrderCodeAndWaybillNo(finalLoadId1,nodeId,orderCode,waybillNo);
 					});
 				}
+			}else{
+				log.warn("###############updateWaybillOrderIsCustemer: 订单已有签收数据不能移除");
+				return R.fail(405,"订单已有签收数据，不能移除");
+			}
 		}
 
 		List<TrunklineLoadSignOrderEntity> signOrderList =trunklineLoadSignOrderService.findSignOrderListByLoadId(loadId);