订单转库存品维护在库数量、订单详情过滤库存品包件

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java

@@ -1302,10 +1302,8 @@ public class DistributionStockupAppController extends BladeController {
 				return Resp.scanFail("当前货位的库存品已为零，请更换货位继续！！", "当前货位的库存品已为零，请更换货位继续！！");
 			}
 		} else {
-
 			// 读取码表上的配置项 是否开启验证批次号
 			String isCheckIncomingBatch = DictBizCache.getValue("isCheckIncomingBatch", "isCheckIncomingBatch");
-
 			List<DistributionParcelListEntity> list = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
 				.eq(DistributionParcelListEntity::getOrderPackageCode, packetBarCode)
 				.eq(DistributionParcelListEntity::getOrderCode, byId.getIncomingBatch())
@@ -1395,13 +1393,13 @@ public class DistributionStockupAppController extends BladeController {
 									R r = warehouseUpdownTypeClient.downStock(list);
 									if (r.getCode() != 200) {
 										log.debug("##########" + r.getMsg());
-										return Resp.scanFail("下架失败，请联系管理员！！", "下架失败，请联系管理员！！");
+//										return Resp.scanFail("下架失败，请联系管理员！！", "下架失败，请联系管理员！！");
 									}
 								} else {
 									R r = warehouseUpdownTypeClient.downPackage(packetBarCode, byId.getWarehouseId());
 									if (r.getCode() != 200) {
 										log.debug("##########" + r.getMsg());
-										return Resp.scanFail("下架失败，请联系管理员！！", "下架失败，请联系管理员！！");
+//										return Resp.scanFail("下架失败，请联系管理员！！", "下架失败，请联系管理员！！");
 									}
 								}
 							} else {

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

@@ -542,6 +542,7 @@
         LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id
         LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id
         <where>
+            ldpl.conditions in ('1','3')
             <if test="param.serviceNumber != null and param.serviceNumber != ''">and ldpl.service_number like
                 concat('%',#{param.serviceNumber},'%')
             </if>

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

@@ -490,6 +490,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 					//修改
 					stockArticleEntity.setId(oo);
 					stockArticleEntity.setGenre(2);
+					stockArticleEntity.setHandQuantity(stockArticleEntity.getHandQuantity() - list1.size());
 					distributionStockArticleMapper.updateById(stockArticleEntity);
 				}
 				//查询库存品的订单
@@ -502,9 +503,15 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 					//修改订单状态
 					DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity();
 						//修改
-						stockArticleEntity.setId(oo);
-						stockArticleEntity.setGenre(2);
+					stockArticleEntity.setId(oo);
+					stockArticleEntity.setGenre(2);
+					stockArticleEntity.setTotalNumber(stockArticleEntity.getTotalNumber() - list1.size());
 					distributionStockArticleMapper.updateById(stockArticleEntity);
+				}else {
+
+					DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleMapper.selectById(oo);
+					distributionStockArticleEntity.setHandQuantity(distributionStockArticleEntity.getHandQuantity() - list1.size());
+					distributionStockArticleMapper.updateById(distributionStockArticleEntity);
 				}
 			});
 			return R.success("操作成功！");