Merge branch 'dev' into pre-production

9 months ago · 1d7fa292bd
1 changed files with 1 additions and 1 deletions
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
@ -2000,7 +2000,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 				JSONObject jsonObject = new JSONObject();
 				jsonObject.put("warehouseId", myCurrentWarehouse.getId());
 				jsonObject.put("code", stockupDTO.getTrayBarCode());
-				jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId());
+//				jsonObject.put("stockUpAllocationId", stockupDTO.getStockupAllocationId());
 				jsonObject.put("type", 4);
 				jsonObject.put("num", list1.size());
 //				TODO