库存订单可以匹配单价

zkqy-custom-business/src/main/java/com/zkqy/business/domain/ProductWarehousingRecord.java

@@ -201,6 +201,11 @@ public class ProductWarehousingRecord extends BaseEntity {
      */
     private String productName;
 
+    /**
+     * 订单色泽
+     */
+    private String colours;
+
     public String getProductSpecifications() {
         return productSpecifications;
     }
@@ -216,6 +221,13 @@ public class ProductWarehousingRecord extends BaseEntity {
     public void setProductName(String productName) {
         this.productName = productName;
     }
+    public String getColours() {
+        return colours;
+    }
+
+    public void setColours(String colours) {
+        this.colours = colours;
+    }
 
     public void setId(Long id) {
         this.id = id;

zkqy-custom-business/src/main/resources/mapper/business/ProductOutboundRecordMapper.xml

@@ -402,8 +402,7 @@
         p.product_name,
         p.product_specifications,
         r.product_colour AS product_color,
-        c.custom_name,
-        r.confirm_out
+        c.custom_name
         FROM {DBNAME}.product_outbound_record r
         LEFT JOIN {DBNAME}.production p
         ON r.product_id = p.id

zkqy-custom-business/src/main/resources/mapper/business/SaleOrderMapper.xml

@@ -417,10 +417,15 @@
                      pi.sale_order_no                                        as saleNo,
                      p.product_no                                            as productNo,
                      por.levels                                              as productLevel,
+                     por.colours                                             as scolours,
                      IF(batch.batch_number IS NULL, '0', batch.batch_number) as batchNumber,
                      batch.batch_State                                       as batchState,
                      batch.id                                                as batchId
-              from `huaxian`.product_outbound_record por -- 成品出库记录表
+              from (
+                       SELECT p.*,c.sale_product_id,s.colours FROM `huaxian`.product_outbound_record p
+                        LEFT JOIN `huaxian`.product_code_list c ON p.qr_code = c.qr_code
+                        LEFT JOIN `huaxian`.sale_products s ON c.sale_product_id = s.id  GROUP BY p.id
+                   ) por -- 成品出库记录表
                        left join `huaxian`.production p on p.id = por.product_id -- 产品表
                        left join `huaxian`.product_invoice pi on por.notice_number = pi.notice_number -- 产品发货单表
                        left join `huaxian`.product_outbound_record_batch as batch
@@ -431,7 +436,8 @@
                  left join (select sp.product_no                                      as productNo,        -- 产品编号
                                    sp.product_unit_price                              as productUnitPrice, -- 产品单价
                                    CONCAT(m.materie_encoding, m.materie_color_number) as productColour,     -- 产品转码+色泽
-                                   sp.`level` as `level`
+                                   sp.`level` as `level`,
+                                   sp.colours as bcolours
                             from `huaxian`.sale_order so -- 订单表
                                      left join `huaxian`.sale_products sp
                                                on so.sale_no = sp.sale_order_no and sp.del_flag = '0' -- 销售产品表
@@ -441,7 +447,7 @@
                                                on m.materiel_code = sp.colour_number and m.del_flag = '0' -- 物料信息表
                             where so.del_flag = '0'
                               and so.sale_no = #{saleNo}) as b -- 根据销售单编号得到当前订单包含的所有产品
-                           on a.productNo = b.productNo AND a.productLevel = b.`level` and a.productColour = b.productColour;
+                           on a.productNo = b.productNo AND a.productLevel = b.`level` 	AND a.scolours = b.bcolours;
     </select>
 
     <select id="printOutsourceOrderListNowEnd" resultType="com.zkqy.business.domain.vo.SaleProductsVo">

zkqy-custom-business/src/main/resources/mapper/business/SaleProductsMapper.xml

@@ -128,6 +128,7 @@
         <if test="sliceType != null  and sliceType != ''">and slice_type = #{sliceType}</if>
         <if test="colourNumber != null  and colourNumber != ''">and colour_number = #{colourNumber}</if>
         <if test="lotNumber != null  and lotNumber != ''">and lot_number = #{lotNumber}</if>
+        <if test="colours != null  and colours != ''">and colours = #{colours}</if>
     </select>
 
     <select id="selectSaleProductsListAndCustomInfo" parameterType="com.zkqy.business.domain.SaleProducts"

zkqy-ui/src/views/orderMange/components/dialogForm/OutBound.vue

@@ -279,7 +279,7 @@ export default {
             saleNo: row.saleNo,
           };
         }
-        console.log(payload);
+        console.log("+++++++++++++++++++++",row);
         let fun = isRetail ? outboundOrderInfo : printOutsourceOrderList;
         let res = await fun(payload);
         if (res.code == 200) {

zkqy-ui/src/views/orderMange/outStock/index.vue

@@ -208,9 +208,10 @@
               :data="saleProductInfoList"
               border
               stripe
-              :span-method="objectSpanMethod"
+
               :row-class-name="tableRowClassName"
             >
+<!--              :span-method="objectSpanMethod"-->
               <el-table-column align="center" label="编码" prop="productId">
               </el-table-column>
               <el-table-column align="center" label="品名" prop="productName">

zkqy-ui/src/views/orderMange/retailMange/index.vue

@@ -1289,7 +1289,7 @@ export default {
       this.currentRow = row;
       this.outBoundShow = true;
       this.$nextTick(() => {
-        this.$refs.outBoundRef.getTableData(row);
+        this.$refs.outBoundRef.getTableData(row,false);
       });
     },
     // 出库详情回调