新增库位绑定Feign接口与合并采购销售订单

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/entrustorder/EntrustOrderDetailService.java

@@ -83,4 +83,11 @@ public interface EntrustOrderDetailService {
      * @return 委托加工订单明细列表
      */
     List<EntrustOrderDetailRespVO> getEntrustOrderDetailListByOrderId(Long orderId);
+    /**
+     * 通过订单ID删除订单
+     *
+     * @param orderId 编号
+     *
+     */
+    void deleteEntrustOrderDetailByOrderId(List<Long> orderId);
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/entrustorder/EntrustOrderDetailServiceImpl.java

@@ -110,4 +110,9 @@ public class EntrustOrderDetailServiceImpl implements EntrustOrderDetailService
         return BeanUtils.toBean(entrustOrderDetailMapper.selectList(EntrustOrderDetailDO::getOrderId, orderId), EntrustOrderDetailRespVO.class);
     }
 
+    @Override
+    public void deleteEntrustOrderDetailByOrderId(List<Long> orderId) {
+        entrustOrderDetailMapper.delete(EntrustOrderDetailDO::getOrderId,orderId);
+    }
+
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/entrustorder/EntrustOrderOrderServiceImplImpl.java

@@ -122,6 +122,8 @@ public class EntrustOrderOrderServiceImplImpl implements EntrustOrderOrderServic
         validateEntrustOrderOrderExists(ids);
         // 删除
         entrustOrderOrderMapper.deleteByIds(ids);
+        // 删除委托加工订单明细
+        entrustOrderDetailService.deleteEntrustOrderDetailByOrderId(ids);
     }
 
     private void validateEntrustOrderOrderExists(List<Long> ids) {

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/originalmaterialprocessing/OriginalMaterialProcessingDetailService.java

@@ -87,4 +87,11 @@ public interface OriginalMaterialProcessingDetailService {
      * @return 来料加工订单明细列表
      */
     List<OriginalMaterialProcessingDetailRespVO> getOriginalMaterialProcessingDetailListByOrderId(Long orderId);
+    /**
+     * 根据订单ids删除来料加工订单明细列表
+     *
+     * @param orderIds 订单编号
+     *
+     */
+    void deleteOriginalMaterialProcessingDetailByOrderIds(List<Long> orderIds);
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/originalmaterialprocessing/OriginalMaterialProcessingDetailServiceImpl.java

@@ -110,4 +110,9 @@ public class OriginalMaterialProcessingDetailServiceImpl implements OriginalMate
         return BeanUtils.toBean(originalMaterialProcessingDetails, OriginalMaterialProcessingDetailRespVO.class);
     }
 
+    @Override
+    public void deleteOriginalMaterialProcessingDetailByOrderIds(List<Long> orderIds) {
+        originalMaterialProcessingDetailMapper.delete(OriginalMaterialProcessingDetailDO::getOrderId,orderIds);
+    }
+
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/originalmaterialprocessing/OriginalMaterialProcessingServiceImplImpl.java

@@ -107,19 +107,26 @@ public class OriginalMaterialProcessingServiceImplImpl implements OriginalMateri
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void deleteOriginalMaterialProcessing(Long id) {
         // 校验存在
         validateEntrustOrderOrderExists(id);
         // 删除
         originalMaterialProcessingMapper.deleteById(id);
+        // 删除委托加工订单明细
+        originalMaterialProcessingDetailService.deleteOriginalMaterialProcessingDetailByOrderIds(List.of(id));
+
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void deleteOriginalMaterialProcessingListByIds(List<Long> ids) {
         // 校验存在
         validateEntrustOrderOrderExists(ids);
         // 删除
         originalMaterialProcessingMapper.deleteByIds(ids);
+        // 删除委托加工订单明细
+        originalMaterialProcessingDetailService.deleteOriginalMaterialProcessingDetailByOrderIds(ids);
     }
 
     private void validateEntrustOrderOrderExists(List<Long> ids) {

zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/InternalWarehouseApi.java

@@ -23,7 +23,7 @@ public interface InternalWarehouseApi {
      * @return 仓库列表
      */
     @GetMapping(PREFIX + "/list-by-factory-code-and-warehouse-code")
-    @Operation(summary = "根据工厂代码和仓库代码获取仓库列表", description = "根据工厂代码和仓库代码获取仓库列表;factoryCode是工厂编码,warehouseCode是仓库编码,mmsiType是业务类型,operationType是操作类型")
+    @Operation(summary = "根据工厂代码和仓库代码获取仓库列表", description = "根据工厂代码和仓库代码获取仓库列表;factoryCode是工厂编码,warehouseCode是仓库编码,mmsiType是业务类型(字典：SPLY_BSN_TP),operationType是操作类型(字典：WAREHOUSE_OPERATION)")
     CommonResult<List<InternalWarehouseDTO>> getInternalWarehouseListByFactoryCodeAndWarehouseCode(@RequestParam(value = "factoryCode") String factoryCode, @RequestParam(value = "warehouseCode") String warehouseCode, @RequestParam(value = "mmsiType", required = false) String mmsiType, @RequestParam(value = "operationType", required = false) String operationType);
 
 }