Merge remote-tracking branch 'origin/master'

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

@@ -99,4 +99,19 @@ public class StockPreparationVo {
      */
     private Integer lockStorage;
 
+    /**
+     * 加工面板 字典:charge_item
+     */
+    private String machinedPanel;
+
+    /**
+     * 图稿名称
+     */
+    private String artworkName;
+
+    /**
+     * 颜色
+     */
+    private String colour;
+
 }

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

@@ -32,6 +32,26 @@ public class UncompletedVo {
     private BigDecimal totalQuantity;
 
     /**
+     * 长 cm
+     */
+    private String length;
+
+    /**
+     * 宽 cm
+     */
+    private String width;
+
+    /**
+     * 高 cm
+     */
+    private String height;
+
+    /**
+     * 颜色
+     */
+    private String colour;
+
+    /**
      * sku消息
      */
     private List<SkuInfo> skuInfoList;
@@ -60,6 +80,16 @@ public class UncompletedVo {
          */
         private BigDecimal quantity;
 
+        /**
+         * 加工面板 字典:charge_item
+         */
+        private String machinedPanel;
+
+        /**
+         * 图稿名称
+         */
+        private String artworkName;
+
     }
 
 

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

@@ -126,12 +126,18 @@ public class StockPreparationServiceImpl implements StockPreparationService {
                             uncompletedVo.setBomSpecCode(item.getBomSpecCode());
                             uncompletedVo.setBomSpecName(item.getBomSpecName());
                             uncompletedVo.setTotalQuantity(item.getQuantity());
+                            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());
                             skuInfo.setSkuSpecCode(item.getSkuSpecCode());
                             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,20 +6,27 @@
         select bs.id           bomSpecId,
                bs.code         bomSpecCode,
                bs.name         bomSpecName,
+               bs.colour,
                ss.id           skuSpecId,
                ss.code         skuSpecCode,
                ss.name         skuSpecName,
+               ss.machined_panel machinedPanel,
+               CAST(0+CAST(bs.length as char) as char) length,
+               CAST(0+CAST(bs.width as char) as char) width,
+               CAST(0+CAST(bs.height as char) as char) height,
                os.quantity,
                os.id           orderSkuId,
                oi.id           orderId,
                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>