待出库列表新增字段

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

@@ -104,4 +104,14 @@ public class StockPreparationVo {
      */
     private String machinedPanel;
 
+    /**
+     * 图稿名称
+     */
+    private String artworkName;
+
+    /**
+     * 颜色
+     */
+    private String colour;
+
 }

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

@@ -47,6 +47,11 @@ public class UncompletedVo {
     private String height;
 
     /**
+     * 颜色
+     */
+    private String colour;
+
+    /**
      * sku消息
      */
     private List<SkuInfo> skuInfoList;
@@ -80,6 +85,11 @@ public class UncompletedVo {
          */
         private String machinedPanel;
 
+        /**
+         * 图稿名称
+         */
+        private String artworkName;
+
     }
 
 

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

@@ -129,6 +129,7 @@ public class StockPreparationServiceImpl implements StockPreparationService {
                             uncompletedVo.setLength(item.getLength());
                             uncompletedVo.setWidth(item.getWidth());
                             uncompletedVo.setHeight(item.getHeight());
+                            uncompletedVo.setColour(item.getColour());
 
                             UncompletedVo.SkuInfo skuInfo = new UncompletedVo.SkuInfo();
                             skuInfo.setSkuSpecId(item.getSkuSpecId());
@@ -136,6 +137,7 @@ public class StockPreparationServiceImpl implements StockPreparationService {
                             skuInfo.setSkuSpecName(item.getSkuSpecName());
                             skuInfo.setQuantity(item.getQuantity());
                             skuInfo.setMachinedPanel(item.getMachinedPanel());
+                            skuInfo.setArtworkName(item.getArtworkName());
 
                             List<UncompletedVo.SkuInfo> skuInfoList = new ArrayList<>();
                             skuInfoList.add(skuInfo);

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

@@ -6,6 +6,7 @@
         select bs.id           bomSpecId,
                bs.code         bomSpecCode,
                bs.name         bomSpecName,
+               bs.colour,
                ss.id           skuSpecId,
                ss.code         skuSpecCode,
                ss.name         skuSpecName,
@@ -19,11 +20,13 @@
                oi.code         orderCode,
                oi.wln_code orderWlnCode,
                os.print_type   printType,
-               oi.lock_storage lockStorage
+               oi.lock_storage lockStorage,
+               al.artwork_name artworkName
         from order_info oi
                  inner join order_sku os on oi.id = os.order_id
                  inner join sku_spec ss on os.sku_spec_id = ss.id
                  inner join bom_spec bs on os.bom_spec_id = bs.id
+                 inner join artwork_library al on ss.artwork_library_id = al.id
             ${ew.customSqlSegment}
     </select>