1.修改查询库存逻辑，增加供应商ID和仓库号条件

api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/CodesServiceImpl.java

@@ -181,7 +181,7 @@ public class CodesServiceImpl implements CodesService {
                     //删除码详情
                     codesDao.deleteByOrderIdAndCode(warehouseEntity.getOrderId(), warehouseEntity.getCode());
 
-                    if (order.getStatus().equals(ConstantStatus.ORDER_STATUS_PROCESS)) {
+                    if (order.getStatus().equals(ConstantStatus.ORDER_STATUS_SUCCESS)) {
                         //查询库存详情
                         FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
                         filterInvProductDetailRequest.setOriginCode(codesReplaceRequest.getCode());
@@ -202,6 +202,8 @@ public class CodesServiceImpl implements CodesService {
                             //查询原库存详情和新的库存详情
                             FilterInvProductRequest filterInvProductRequest = new FilterInvProductRequest();
                             filterInvProductRequest.setRelIdFk(invProductDetailEntity.getProductIdFk());
+                            filterInvProductRequest.setSupId(invProductDetailEntity.getSupId());
+                            filterInvProductRequest.setInvStorageCode(invProductDetailEntity.getInvStorageCode());
                             if (StrUtil.isBlank(invProductDetailEntity.getBatchNo())) {
                                 filterInvProductRequest.setBatchNo("empty");
                             } else {

api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java

@@ -380,7 +380,7 @@ public class OrderServiceImpl implements OrderService {
             OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
             orderFilterRequest.setId(id);
             OrderEntity orderEntity = orderDao.findOne(orderFilterRequest);
-            if (orderEntity.getStatus().equals(ConstantStatus.ORDER_STATUS_PROCESS)) {
+            if (orderEntity.getStatus().equals(ConstantStatus.ORDER_STATUS_SUCCESS)) {
                 //查询库存详情
                 FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
                 filterInvProductDetailRequest.setOrderIdFk(id);
@@ -389,10 +389,11 @@ public class OrderServiceImpl implements OrderService {
 
                 List<InvProductEntity> invProductList = new ArrayList<>(invProductDetailMap.keySet().size());
 
-
                 for (InvProductDetailEntity invProductDetailEntity : invProductDetailEntities) {
                     FilterInvProductRequest filterInvProductRequest = new FilterInvProductRequest();
                     filterInvProductRequest.setRelIdFk(invProductDetailEntity.getProductIdFk());
+                    filterInvProductRequest.setSupId(invProductDetailEntity.getSupId());
+                    filterInvProductRequest.setInvStorageCode(invProductDetailEntity.getInvStorageCode());
                     if (StrUtil.isBlank(invProductDetailEntity.getBatchNo())) {
                         filterInvProductRequest.setBatchNo("empty");
                     } else {
@@ -445,6 +446,16 @@ public class OrderServiceImpl implements OrderService {
                 try {
                     orderDao.deleteById(id);
                     orderDetailDao.deleteByOrderId(id);
+
+                    //查询业务单据
+                    StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest();
+                    stockOrderFilterRequest.setBillNo(orderEntity.getErpFk());
+                    StockOrderEntity stockOrderEntity = stockOrderDao.findOne(stockOrderFilterRequest);
+                    //删除业务单据详情
+                    stockOrderDetailDao.deleteByOrderIdFk(stockOrderEntity.getId());
+                    //删除业务单据
+                    stockOrderDao.deleteById(stockOrderEntity.getId());
+                    //删除码
                     codesDao.deleteByOrderId(id);
                 } catch (Exception e) {
                     throw new RuntimeException("删除单据失败");