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

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java

@@ -31,7 +31,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -192,4 +191,7 @@ public interface IDistributionStockArticleClient {
 
 	@PostMapping(value = API_PREFIX + "/findAllStockArticleListByOrderCodes",consumes = MediaType.APPLICATION_JSON_VALUE)
     List<DistributionStockArticleEntity> findAllStockArticleListByOrderCodes(@RequestBody List<String> orderCodes);
+
+	@GetMapping(API_PREFIX + "/addHandQuantityAndIncomingNum")
+    void addHandQuantityAndIncomingNum(@RequestParam Long stockId, @RequestParam Integer enterNum);
 }

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java

@@ -205,7 +205,7 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl<Aftersa
 									}
 								}else{
 
-									stockArticleClient.addHandQuantity(currentStockArticleEntity.getId(),enterNum);
+									stockArticleClient.addHandQuantityAndIncomingNum(currentStockArticleEntity.getId(),enterNum);
 
 								}
 								abnormalRecordEntity.setRemark("差异"+enterNum+"件数入库本仓");

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataFactoryCategoryExcel.java

@@ -50,6 +50,10 @@ public class BasicdataFactoryCategoryExcel implements Serializable {
 	@ExcelProperty("结算品类")
 	private String category;
 
+	@ColumnWidth(20)
+	@ExcelProperty("结算类型 1 收入 2 成本")
+	private Integer type;
+
 	@ColumnWidth(20)
 	@ExcelProperty("一级品")
 	private String firsts;
@@ -62,4 +66,8 @@ public class BasicdataFactoryCategoryExcel implements Serializable {
 	@ExcelProperty("三级品")
 	private String thirds;
 
+	@ColumnWidth(20)
+	@ExcelProperty("物料名称")
+	private String materielName;
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java

@@ -384,4 +384,9 @@ public class DistributionStockArticleClient implements IDistributionStockArticle
 		return distributionStockArticleService.list(queryWrapper);
 	}
 
+	@Override
+	public void addHandQuantityAndIncomingNum(Long stockId, Integer enterNum) {
+		distributionStockArticleService.addHandQuantityAndIncomingNum(stockId,enterNum);
+	}
+
 }

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

@@ -226,4 +226,6 @@ public interface DistributionStockArticleMapper extends BaseMapper<DistributionS
 	 * @return
 	 */
 	List<DistributionStockArticleEntity> exportMallOrder(@Param("param") Map<String, Object> paramMap);
+
+    void addHandQuantityAndIncomingNum(@Param("stockId") Long stockId, @Param("enterNum") Integer enterNum);
 }

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

@@ -2036,4 +2036,11 @@
         </foreach>
     </update>
 
+    <update id="addHandQuantityAndIncomingNum" >
+        update logpm_distribution_stock_article
+        set hand_quantity = hand_quantity + #{enterNum},
+            incoming_num = incoming_num + #{enterNum}
+        where id = #{stockId}
+    </update>
+
 </mapper>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java

@@ -311,4 +311,6 @@ public interface IDistributionStockArticleService extends BaseService<Distributi
 	void clearAllocationByIds(List<Long> clearAllocationStockArticleIdList);
 
 	OrderCodeDataVO showOrderCodeByCode(List<TrunklineOrderCodeDTO> orderCodeDTOList) throws Exception;
+
+	void addHandQuantityAndIncomingNum(Long stockId, Integer enterNum);
 }

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

@@ -2639,6 +2639,11 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		return orderCodeDataVO;
 	}
 
+	@Override
+	public void addHandQuantityAndIncomingNum(Long stockId, Integer enterNum) {
+		baseMapper.addHandQuantityAndIncomingNum(stockId,enterNum);
+	}
+
 	/**
 	 * @param page
 	 * @param distributionSignforStockArticle

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

@@ -575,7 +575,7 @@
         where load_id = #{loadId}
           and final_node_id = #{warehouseId}
           and type = 2
-          and unload_num != num
+          and IFNULL(unload_num,0) != num
     </select>
 
     <select id="findPackageListByLoadId" resultType="String">

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

@@ -7076,33 +7076,35 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 //						}
 
 
-						DistributionParcelListEntity nowParcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, nowWarehouseId);
-						if(Objects.isNull(nowParcelListEntity)){
-							log.warn("###############unloadPackage: 包件信息不存在 orderPackageCode={},nowWarehouseId={}",orderPackageCode,nowWarehouseId);
-							return R.fail(405,"包件信息不存在");
-						}
-						orderCode = nowParcelListEntity.getOrderCode();
-						Long packageId = nowParcelListEntity.getId();
-						String orderPackageStatus = nowParcelListEntity.getOrderPackageStatus();
-						String waybillNumber = nowParcelListEntity.getWaybillNumber();
+//						DistributionParcelListEntity nowParcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, nowWarehouseId);
+//						if(Objects.isNull(nowParcelListEntity)){
+//							log.warn("###############unloadPackage: 包件信息不存在 orderPackageCode={},nowWarehouseId={}",orderPackageCode,nowWarehouseId);
+//							return R.fail(405,"包件信息不存在");
+//						}
+						orderCode = advanceDetailEntity.getOrderCode();
+						Long waybillId = advanceDetailEntity.getWaybillId();
+						Long incomingWarehouseId = advanceDetailEntity.getIncomingWarehouseId();
 
-						DistributionStockArticleEntity nowDistributionStockArticle = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode, nowWarehouseId);
-						if(Objects.isNull(nowDistributionStockArticle)){
-							log.warn("###############unloadPackage: 订单信息不存在 orderCode={},nowWarehouseId={}",orderCode,nowWarehouseId);
-							return R.fail(405,"订单信息不存在");
-						}
-						Long articleId = nowDistributionStockArticle.getId();
+//						DistributionStockArticleEntity nowDistributionStockArticle = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode, nowWarehouseId);
+//						if(Objects.isNull(nowDistributionStockArticle)){
+//							log.warn("###############unloadPackage: 订单信息不存在 orderCode={},nowWarehouseId={}",orderCode,nowWarehouseId);
+//							return R.fail(405,"订单信息不存在");
+//						}
+//						Long articleId = nowDistributionStockArticle.getId();
 
-						if(!"70".equals(orderPackageStatus)){
-							distributionStockArticleClient.submitHandleNumByOrderId(1, articleId);
-							distributionParcelListClient.updateOrderPackageCodeById(packageId, "60");
-						}
+//						if(!"70".equals(orderPackageStatus)){
+//							distributionStockArticleClient.submitHandleNumByOrderId(1, articleId);
+//							distributionParcelListClient.updateOrderPackageCodeById(packageId, "60");
+//						}
 
 
 						Long currentOrderId = null;
 						//查询当前仓库订单信息有没有
 						DistributionStockArticleEntity currentStockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode, warehouseId);
 						if (Objects.isNull(currentStockArticleEntity)) {
+
+							DistributionStockArticleEntity nowDistributionStockArticle = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode,incomingWarehouseId);
+
 							//查询包件前面仓的订单信息
 							currentStockArticleEntity = new DistributionStockArticleEntity();
 							BeanUtil.copy(nowDistributionStockArticle, currentStockArticleEntity);
@@ -7129,7 +7131,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 						}
 
 						//判断包件当前仓是否是目的仓
-						WarehouseWaybillEntity warehouseWaybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNumber);
+						WarehouseWaybillEntity warehouseWaybillEntity = warehouseWaybillClient.findByWaybillId(waybillId);
+
+						DistributionParcelListEntity nowParcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, incomingWarehouseId);
 
 						if (Objects.isNull(distributionParcelListEntity)) {
 							distributionParcelListEntity = new DistributionParcelListEntity();