快捷出库接口

sd-business/src/main/java/com/sd/business/entity/production/vo/PackageBomVo.java

@@ -17,6 +17,21 @@ public class PackageBomVo {
     private Long bomSpecId;
 
     /**
+     * bom id
+     */
+    private Long bomId;
+
+    /**
+     * bom分类id
+     */
+    private Long bomClassifyId;
+
+    /**
+     * bom分类名称
+     */
+    private String bomClassifyName;
+
+    /**
      * bom品名
      */
     private String bomSpecName;

sd-business/src/main/java/com/sd/business/entity/production/vo/StockPreparationVo.java

@@ -89,14 +89,4 @@ public class StockPreparationVo {
      */
     private String orderWlnCode;
 
-    /**
-     * bom分类id
-     */
-    private Long bomClassifyId;
-
-    /**
-     * bom分类名称
-     */
-    private String bomClassifyName;
-
 }

sd-business/src/main/java/com/sd/business/service/production/impl/StockPreparationServiceImpl.java

@@ -29,6 +29,8 @@ import com.sd.business.entity.sku.po.Sku;
 import com.sd.business.entity.sku.po.SkuSpec;
 import com.sd.business.entity.warehouse.constant.WarehouseConstant;
 import com.sd.business.mapper.production.StockPreparationMapper;
+import com.sd.business.service.bom.BomClassifyService;
+import com.sd.business.service.bom.BomService;
 import com.sd.business.service.bom.BomSpecService;
 import com.sd.business.service.in.InOutStorageService;
 import com.sd.business.service.order.OrderService;
@@ -83,6 +85,12 @@ public class StockPreparationServiceImpl implements StockPreparationService {
     @Autowired
     private BomSpecService bomSpecService;
 
+    @Autowired
+    private BomService bomService;
+
+    @Autowired
+    private BomClassifyService bomClassifyService;
+
     @Override
     public List<StockPreparationVo> uncompletedList(StockPreparationDto dto) {
         IWrapper<StockPreparationVo> wrapper = createWrapper(dto);
@@ -173,6 +181,15 @@ public class StockPreparationServiceImpl implements StockPreparationService {
         bomSpecService.attributeAssign(result, PackageBomVo::getBomSpecId, (item, bomSpec) -> {
             item.setBomSpecCode(bomSpec.getCode());
             item.setBomSpecName(bomSpec.getName());
+            item.setBomId(bomSpec.getBomId());
+        });
+
+        bomService.attributeAssign(result, PackageBomVo::getBomId, (item, bom) -> {
+            item.setBomClassifyId(bom.getBomClassifyId());
+        });
+
+        bomClassifyService.attributeAssign(result, PackageBomVo::getBomClassifyId, (item, bomClassify) -> {
+            item.setBomClassifyName(bomClassify.getName());
         });
 
         return result;

sd-business/src/main/resources/mapper/production/StockPreparationMapper.xml

@@ -12,30 +12,26 @@
 
     <sql id="sql">
         select os.blueprint,
-               d.name            departmentName,
-               bs.code           bomSpecCode,
-               bs.name           bomSpecName,
-               ss.code           skuSpecCode,
-               ss.name           skuSpecName,
+               d.name      departmentName,
+               bs.code     bomSpecCode,
+               bs.name     bomSpecName,
+               ss.code     skuSpecCode,
+               ss.name     skuSpecName,
                bs.length,
                bs.width,
                bs.height,
                os.quantity,
-               oi.id             orderId,
-               oi.code           orderCode,
-               oi.wln_code       orderWlnCode,
-               os.id             orderSkuId,
-               ss.id             skuSpecId,
-               bs.id             bomSpecId,
-               b.bom_classify_id bomClassifyId,
-               bc.name           bomClassifyName
+               oi.id       orderId,
+               oi.code     orderCode,
+               oi.wln_code orderWlnCode,
+               os.id       orderSkuId,
+               ss.id       skuSpecId,
+               bs.id       bomSpecId
         from order_info oi
                  inner join order_sku os on oi.id = os.order_id
                  left join department d on oi.department_id = d.id
                  left join sku_spec ss on os.sku_spec_id = ss.id
                  left join bom_spec bs on os.bom_spec_id = bs.id
-                 left join bom b on bs.bom_id = b.id
-                 left join bom_classify bc on b.bom_classify_id = bc.id
             ${ew.customSqlSegment}
     </sql>