Merge branch 'pre-production'

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

@@ -136,4 +136,7 @@ public interface IDistributionStockArticleClient {
 
 	@GetMapping(API_PREFIX + "/findZeroListByWarehouseId")
 	IPage<JSONObject> findZeroListByWarehouseId(@RequestParam Long warehouseId, @RequestParam Integer pageNum, @RequestParam Integer pageSize);
+
+	@GetMapping(API_PREFIX + "/submitHandleNumAndTotalNumberByOrderId")
+	void submitHandleNumAndTotalNumberByOrderId(@RequestParam Integer subNum, @RequestParam Long articleId);
 }

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

@@ -278,4 +278,9 @@ public class DistributionStockArticleClient implements IDistributionStockArticle
 		return distributionStockArticleService.findZeroListByWarehouseId(warehouseId,pageNum,pageSize);
 	}
 
+	@Override
+	public void submitHandleNumAndTotalNumberByOrderId(Integer subNum, Long articleId) {
+		distributionStockArticleService.submitHandleNumAndTotalNumberByOrderId(subNum,articleId);
+	}
+
 }

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

@@ -179,4 +179,6 @@ public interface DistributionStockArticleMapper extends BaseMapper<DistributionS
     List<Long> getOrderListByWaybill(@Param("waybillNumber") String waybillNumber);
 
 	List<DistributionStockArticleEntity> findListByOrderCodeLike(@Param("orderCode") String orderCode);
+
+    void submitHandleNumAndTotalNumberByOrderId(@Param("subNum") Integer subNum, @Param("articleId") Long articleId);
 }

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

@@ -1064,4 +1064,12 @@
         AND waybill_number != ''
     </select>
 
+    <update id="submitHandleNumAndTotalNumberByOrderId" >
+        update logpm_distribution_stock_article
+        set total_number = total_number - #{subNum},
+            hand_quantity = hand_quantity - #{subNum},
+            incoming_num = incoming_num - #{subNum}
+        where id = #{articleId}
+    </update>
+
 </mapper>

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

@@ -229,4 +229,7 @@ public interface IDistributionStockArticleService extends BaseService<Distributi
     R getdeliveryInfo(Integer type, String code);
 
 	List<DistributionStockArticleEntity> findListByOrderCodeLike(String orderCode);
+
+    void submitHandleNumAndTotalNumberByOrderId(Integer subNum, Long articleId);
+
 }

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

@@ -95,6 +95,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 
 	private final IDistributionStockListInfoService distributionStockListInfoService;
 	private final IDistributionStockListService distributionStockListService;
+
 	private final IDistributionReservationZeroPackageService reservationZeroPackageService;
 
 	private final IDistrilbutionBillPackageService distrilbutionBillPackageService;
@@ -854,7 +855,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 
 		BasicMaterialEntity materialOwnId = basicMaterialClient.getMaterialOwnId(materialId.get(0));
 		distributionStockListEntity.setSku(materialOwnId.getSku());
-		distributionStockListEntity.setMaterialId(materialId.get(0));//货物ID
+//		distributionStockListEntity.setMaterialId(materialId.get(0));//货物ID
 //		distributionStockListEntity.setParcelListId(distributionParcelListEntities.getId());//包件id
 		distributionStockListEntity.setQuantityOccupied(0);//冻结数量
 		distributionStockListEntity.setServiceType(distributionStockArticleEntity.getTypeService());//冻结数量
@@ -869,7 +870,8 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 			distributionStockListService.updateById(listEntity);
 		} else {
 			log.info("###########distributionStockListEntity>>>>>>>>,{}",distributionStockListEntity);
-			distributionStockListService.save(distributionStockListEntity);
+//			distributionStockListService.save(distributionStockListEntity);
+			distributionStockListService.getBaseMapper().insert(distributionStockListEntity);
 		}
 //		distributionStockListEntity.setTrayName(Optional.ofNullable(distributionParcelList.getPallet()).orElse(null)); //托盘
 //		distributionStockListEntity.setStorageLocation(Optional.ofNullable(distributionParcelList.getGoodsAllocation()).orElse(null)); //库位信息

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

@@ -56,7 +56,6 @@ import org.springblade.common.constant.orderpackage.OrderPackageLoadingStatusCon
 import org.springblade.common.constant.orderpackage.OrderPackageReservationStatusConstant;
 import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant;
 import org.springblade.common.constant.printTemplate.PrintTemplateStatusConstant;
-import org.springblade.common.constant.reservation.ReservationOrderStatusConstant;
 import org.springblade.common.constant.reservation.ReservationPackageStatusConstant;
 import org.springblade.common.exception.CustomerException;
 import org.springblade.common.utils.CommonUtil;
@@ -1784,6 +1783,11 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		return baseMapper.findListByOrderCodeLike(orderCode);
 	}
 
+	@Override
+	public void submitHandleNumAndTotalNumberByOrderId(Integer subNum, Long articleId) {
+		baseMapper.submitHandleNumAndTotalNumberByOrderId(subNum,articleId);
+	}
+
 
 	@Override
 	public DistributionStockArticleEntity findZeroByOrderCodeAndWarehouseId(String orderCode, Long warehouseId) {

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java

@@ -464,14 +464,12 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 			entity.setDeliveryQuantity(0);
 			entity.setTransferQuantity(0);
 			entity.setSigninQuantity(0);
-			entity.setGroundingStatus(0 + "");
 			entity.setIsOpai(1);
 			entity.setAvailableQuantity(allNum);
 			entity.setCreateUser(null);
 			entity.setCreateDept(null);
 			entity.setUpdateUser(null);
 			entity.setInventoryPersonId(null);
-			entity.setFreezeStatus(0 + "");
 			entity.setId(null);
 			Long aLong = distributionStockArticleClient.addData(entity);
 			if (aLong == 0) {
@@ -507,7 +505,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 				distributionParcelNumberClient.addBatch(parcelNumberList);
 			}
 		}
-		distributionStockArticleClient.submitHandleNumByOrderId(subNum,articleId);
+		distributionStockArticleClient.submitHandleNumAndTotalNumberByOrderId(subNum,articleId);
 	}