Merge remote-tracking branch 'origin/master'

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

@@ -210,6 +210,33 @@ public class ProductInvoice extends BaseEntity {
      */
     private boolean isOrderUpdate;
 
+    /**
+     * 销售单工艺要求编号
+     */
+    private String saleordertechnologyno;
+
+    public String getSaleordertechnologyno() {
+        return saleordertechnologyno;
+    }
+
+    public void setSaleordertechnologyno(String saleordertechnologyno) {
+        this.saleordertechnologyno = saleordertechnologyno;
+    }
+
+    /**
+     * 销售单状态
+     */
+    private String sstatus;
+
+    public String getSstatus() {
+        return sstatus;
+    }
+
+    public void setSstatus(String sstatus) {
+        this.sstatus = sstatus;
+    }
+
+
     public boolean isOrderUpdate() {
         return isOrderUpdate;
     }

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/java/com/zkqy/business/mapper/SaleOrderMapper.java

@@ -136,6 +136,10 @@ public interface SaleOrderMapper {
      */
     List<SaleProductsVo> printOutsourceOrderList(@Param("noticeNumber") String noticeNumber, @Param("saleNo") String saleNo, @Param("batchNumber") String batchNumber);
 
+    /**
+     * 零售单查询打印出库单列表
+     */
+    List<SaleProductsVo> lsdPrintOutsourceOrderList(@Param("noticeNumber") String noticeNumber, @Param("saleNo") String saleNo, @Param("batchNumber") String batchNumber);
     /**
      * 得到当前订单未阶段性完成的产品数据
      */

zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/SaleOrderServiceImpl.java

@@ -480,9 +480,17 @@ public class SaleOrderServiceImpl implements ISaleOrderService {
         if (productInvoice == null) {
             return new ArrayList<>();
         }
-        // 获取当前订单出库产品信息
-        List<SaleProductsVo> saleProductsVos = saleOrderMapper.printOutsourceOrderList(productInvoice.getNoticeNumber(), saleNo, batchNumber);
-        return saleProductsVos;
+        if (productInvoice.getSaleordertechnologyno().equals("retailOrder") && (productInvoice.getSstatus() != "6")){
+            // 获取当前订单出库产品信息
+            //零售单
+            List<SaleProductsVo> saleProductsVos = saleOrderMapper.lsdPrintOutsourceOrderList(productInvoice.getNoticeNumber(), saleNo, batchNumber);
+            return saleProductsVos;
+        }else{
+            // 获取当前订单出库产品信息
+            List<SaleProductsVo> saleProductsVos = saleOrderMapper.printOutsourceOrderList(productInvoice.getNoticeNumber(), saleNo, batchNumber);
+            return saleProductsVos;
+        }
+
     }
 
     /**

zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/SaleRegistrationCollectionServiceImpl.java

@@ -161,7 +161,7 @@ public class SaleRegistrationCollectionServiceImpl implements ISaleRegistrationC
             // saleAccountsReceivableDetail1.setAmountReceivable(saleRegistrationCollection.getAmounts());//应收金额
             saleAccountsReceivableDetail1.setReceivedAmount(saleRegistrationCollection.getAmounts());
             //加后余额
-            Double addedBalance2 = amount - saleRegistrationCollection.getAmounts();
+            Double addedBalance2 = amount + saleRegistrationCollection.getAmounts();
             saleAccountsReceivableDetail1.setAmounts(handlingWeight(addedBalance2));//余额
             saleAccountsReceivableDetail1.setCustomerId(saleRegistrationCollection.getCustomerId());// 客户名称
             saleAccountsReceivableDetail1.setAccountsReceivableDate(saleRegistrationCollection.getCollectionMoneyDate()); // 日期

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

@@ -37,6 +37,8 @@
         <result property="transferWarehouse" column="transfer_warehouse"/>
         <result property="deliveryDate" column="deliveryDate"/>
         <result property="deliveryClerk" column="delivery_clerk"/>
+        <result property="saleordertechnologyno" column="sale_order_technology_no"/>
+        <result property="sstatus" column="sstatus"/>
     </resultMap>
 
     <sql id="selectProductInvoiceVo">
@@ -219,8 +221,41 @@
     </delete>
 
     <select id="selectProductInvoiceBySaleOrderNo" resultType="com.zkqy.business.domain.ProductInvoice">
-        <include refid="selectProductInvoiceVo"/>
-        where sale_order_no = #{saleOrderNo} and del_flag = '0'
+        select p.id,
+               p.notice_number,
+               p.notice_date,
+               p.salesman,
+               p.customer_id,
+               p.drawer,
+               p.dispatch_note_remark,
+               p.billing_type,
+               p.truck_registration,
+               p.document_type,
+               p.selling_unit,
+               p.calculation_type,
+               p.audit_opinion,
+               p.status,
+               p.sale_order_no,
+               p.spare1,
+               p.spare2,
+               p.spare3,
+               p.spare4,
+               p.remark,
+               p.del_flag,
+               p.create_by,
+               p.create_by_id,
+               p.create_time,
+               p.update_by,
+               p.update_by_id,
+               p.update_time,
+               p.delivery_warehouse,
+               p.transfer_warehouse,
+               p.delivery_date,
+               p.delivery_clerk,
+               s.sale_order_technology_no,
+               s.status as sstatus
+        from {DBNAME}.product_invoice as p left join {DBNAME}.sale_order as s on p.sale_order_no = s.sale_no and s.del_flag = '0'
+        where p.sale_order_no = #{saleOrderNo} and p.del_flag = '0'
     </select>
     <select id="selectProductInvoiceByNoticeNumber" resultType="com.zkqy.business.domain.ProductInvoice">
         <include refid="selectProductInvoiceVo"/>

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
@@ -430,7 +435,9 @@
               group by por.product_id, por.levels, por.lot_num, por.product_colour, por.batch_number) as a
                  left join (select sp.product_no                                      as productNo,        -- 产品编号
                                    sp.product_unit_price                              as productUnitPrice, -- 产品单价
-                                   CONCAT(m.materie_encoding, m.materie_color_number) as productColour     -- 产品转码+色泽
+                                   CONCAT(m.materie_encoding, m.materie_color_number) as productColour,     -- 产品转码+色泽
+                                   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' -- 销售产品表
@@ -440,7 +447,54 @@
                                                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.productColour = b.productColour;
+                           on a.productNo = b.productNo AND a.productLevel = b.`level` 	AND a.scolours = b.bcolours;
+    </select>
+
+    <select id="lsdPrintOutsourceOrderList" resultType="com.zkqy.business.domain.vo.SaleProductsVo">
+        select a.*,
+               b.productUnitPrice -- 产品单价
+        from (select p.id                                                    as productId,
+                     p.product_name                                          as productName,
+                     p.product_specifications                                as productSpecifications,
+                     por.lot_num                                             as lotNumber,
+                     count(por.box_num)                                      as boxNum,
+                     TRUNCATE(sum(por.suttle), 2)                            as productNumber, -- 产品净重（）
+                     por.product_colour                                      as productColour,
+                     por.notice_number                                       as noticeNumber,
+                     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 (
+                       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
+                                 on batch.outbound_record_id = por.id and batch.del_flag = '0' -- 成品出库记录批次表
+              where por.del_flag = '0'
+                and pi.notice_number = #{noticeNumber} -- 通知单号
+              group by por.product_id, por.levels, por.lot_num, por.product_colour, por.batch_number) as a
+                 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.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' -- 销售产品表
+                                     left join `huaxian`.production p
+                                               on sp.product_no = p.product_no and p.del_flag = '0' -- 产品表
+                                     left join `huaxian`.materiel m
+                                               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.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"
@@ -447,7 +448,8 @@
                pt.product_type                                      AS productType,
                sp.remark                                            AS productRemark,
                sp.product_number                                    AS actualWeight,
-               sp.colours                                           AS productColor
+               sp.colours                                           AS productColor,
+               sp.`level`                                           AS levels
         FROM {DBNAME}.sale_products sp
                         LEFT JOIN {DBNAME}.production pt
         ON sp.product_no = pt.product_no
@@ -489,7 +491,7 @@
                   r.product_colour,
                   r.levels) AS a
                  LEFT JOIN {DBNAME}.sale_products sp
-        ON sp.sale_order_no = a.sale_order_no
+        ON sp.sale_order_no = a.sale_order_no  AND sp.`level` = a.levels
             AND sp.product_no = a.productCode and sp.del_flag = '0'
 
     </select>
@@ -526,7 +528,7 @@
                   r.product_colour,
                   r.levels) AS a
                  LEFT JOIN {DBNAME}.sale_products sp
-        ON sp.sale_order_no = a.sale_order_no
+        ON sp.sale_order_no = a.sale_order_no  AND sp.`level` = a.levels
             AND sp.product_no = a.productCode and sp.del_flag = '0'
 
     </select>

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/OrderforgoodsController.java

@@ -0,0 +1,50 @@
+
+package com.zkqy.amichi.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.zkqy.amichi.service.IOrderforgoodsService;
+import com.zkqy.common.annotation.Anonymous;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.zkqy.common.annotation.Log;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.amichi.domain.StationInformation;
+import com.zkqy.amichi.service.IStationInformationService;
+import com.zkqy.common.utils.poi.ExcelUtil;
+import com.zkqy.common.core.page.TableDataInfo;
+
+/**
+ * 订单取消Controller
+ *
+ * @author zkqy
+ * @date 2024-08-20
+ */
+@RestController
+@RequestMapping("/amichi/orderforgoods")
+@Api(value = "/amichi/orderforgoods", description = "订单取消-接口")
+public class OrderforgoodsController extends BaseController
+{
+    @Autowired
+    private IOrderforgoodsService orderforgoodsService;
+
+    /**
+     * 订单取消
+     */
+    @PreAuthorize("@ss.hasPermi('amichi:stationInformation:edit')")
+    @Log(title = "订单取消", businessType = BusinessType.UPDATE)
+    @PutMapping
+    @ApiOperation(value = "订单取消")
+    public String edit(@RequestBody String planNumber)
+    {
+        return orderforgoodsService.updateOrderforgoods(planNumber);
+    }
+
+
+}

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/OrderforgoodsMapper.java

@@ -0,0 +1,15 @@
+package com.zkqy.amichi.mapper;
+
+
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface OrderforgoodsMapper {
+    /**
+     * 查询工位信息
+     *
+     * @param id 工位信息主键
+     * @return 工位信息
+     */
+    //public int updateOrderforgoods(Long id);
+}

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/IOrderforgoodsService.java

@@ -0,0 +1,7 @@
+package com.zkqy.amichi.service;
+
+import com.zkqy.amichi.domain.StationInformation;
+
+public interface IOrderforgoodsService {
+    public String updateOrderforgoods(String planNumber);
+}

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/impl/OrderforgoodsServiceImpl.java

@@ -0,0 +1,71 @@
+package com.zkqy.amichi.service.impl;
+
+import com.zkqy.amichi.domain.ProductionPlanningManagement;
+import com.zkqy.amichi.domain.StationInformation;
+import com.zkqy.amichi.mapper.*;
+import com.zkqy.amichi.service.IOrderforgoodsService;
+import com.zkqy.common.utils.DateUtils;
+import com.zkqy.execution.produce.dispersed.entity.BpmExecuteNodeLog;
+import com.zkqy.execution.produce.dispersed.entity.BpmExecuteProcess;
+import com.zkqy.execution.produce.dispersed.mapper.BpmExecuteNodeLogMapper;
+import com.zkqy.execution.produce.dispersed.mapper.BpmExecuteProcessMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class OrderforgoodsServiceImpl implements IOrderforgoodsService {
+    @Autowired
+    private ProductionPlanningManagementMapper productionPlanningManagementMapper;
+
+    @Autowired
+    private BpmExecuteProcessMapper bpmExecuteProcessMapper;
+
+    @Autowired
+    private BpmExecuteNodeLogMapper bpmExecuteNodeLogMapper;
+    /**
+     * 订单取消
+     *
+     * @param planNumber 订单编号
+     * @return 结果
+     */
+    @Override
+    public String updateOrderforgoods(String planNumber)
+    {
+        ProductionPlanningManagement productionPlanningManagement=new ProductionPlanningManagement();
+        productionPlanningManagement.setOrderNumber(planNumber);
+        List<ProductionPlanningManagement> productionPlanningManagements = productionPlanningManagementMapper.selectProductionPlanningManagementList(productionPlanningManagement);
+        if(productionPlanningManagements.size()<=0){
+            return "未找到当前产品计划--信息不匹配";
+        }
+        else {
+            ProductionPlanningManagement ppm=productionPlanningManagements.get(0);
+            BpmExecuteProcess process=new BpmExecuteProcess();
+            process.setTaskPlanKey(ppm.getId().toString());//计划id
+            List<BpmExecuteProcess> bpmExecuteProcesses = bpmExecuteProcessMapper.selectBpmExecuteProcessListfjqy(process);
+            if(productionPlanningManagements.size()>0){
+                BpmExecuteProcess bpmExecuteProcess=bpmExecuteProcesses.get(0);
+                BpmExecuteNodeLog bpmExecuteNodeLog=new BpmExecuteNodeLog();
+                bpmExecuteNodeLog.setTaskProcessKey(bpmExecuteProcess.getTaskKey());//流程编号
+                List<BpmExecuteNodeLog> bpmExecuteNodeLogs = bpmExecuteNodeLogMapper.selectBpmExecuteNodeLogListfjqy(bpmExecuteNodeLog);
+                if(bpmExecuteNodeLogs.size()>0){
+                    BpmExecuteNodeLog bpmExecuteNodeLog1=bpmExecuteNodeLogs.get(0);
+                    String taskNodeNumber=bpmExecuteNodeLog1.getTaskNodeNumber();
+                    ppm.setQuantity(taskNodeNumber);
+                    productionPlanningManagementMapper.updateProductionPlanningManagement(ppm);
+                    return "操作成功";
+                }
+                else{
+                    return "未找到当前产品计划--信息不匹配";
+                }
+            }
+            else{
+                return "未找到当前产品计划--信息不匹配";
+            }
+
+        }
+
+
+    }
+}

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/index.vue

@@ -418,8 +418,8 @@
                         :value="item.productName"
                       >
                         <span class="discribe" style="float: left">{{
-                          item.productName
-                        }}</span>
+                             item.productName
+                           }}</span>
                         <!-- <span
                           style="float: right; color: #8492a6; font-size: 13px"
                           >{{ item.productSpecifications }}</span
@@ -448,11 +448,11 @@
                       :value="item.productSpecifications"
                     >
                       <span class="discribe" style="float: left">{{
-                        item.productSpecifications
-                      }}</span>
+                          item.productSpecifications
+                        }}</span>
                       <span
                         style="float: right; color: #8492a6; font-size: 13px"
-                        >{{ item.productType }}</span
+                      >{{ item.productType }}</span
                       >
                     </el-option>
                   </el-select>
@@ -491,6 +491,32 @@
                   </el-form-item>
                 </template>
               </el-table-column>
+
+              <el-table-column prop="level" width="100" label="等级">
+                <template slot-scope="scope">
+                  <el-form-item
+                    :prop="'level-' + scope.$index"
+                    :name="'level-' + scope.$index"
+                    style="margin: 0px; padding: 0px"
+                  >
+                    <el-select
+                      v-model="scope.row.level"
+                      placeholder=""
+                      filterable
+                    >
+                      <el-option
+                        v-for="item in levelOptions"
+                        :key="item.id"
+                        :label="item.codeName"
+                        :value="item.codeName"
+                      >
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </template>
+              </el-table-column>
+
+
               <el-table-column prop="productNumber" label="数量/kg">
                 <template slot-scope="scope">
                   <el-form-item
@@ -571,7 +597,7 @@
                     type="danger"
                     size="small"
                     @click="deleteProduct(scope.$index)"
-                    >删除
+                  >删除
                   </el-button>
                 </template>
               </el-table-column>
@@ -582,7 +608,7 @@
               style="width: 100%"
               size="small"
               @click="addProduct"
-              >添加货品
+            >添加货品
             </el-button>
             <el-col :span="12">
               <el-form-item label-width="120px" label="合计金额(大写)">
@@ -729,7 +755,7 @@
             @click="editConfirm"
             :disabled="isAdding"
             :loading="isAdding"
-            >确 定</el-button
+          >确 定</el-button
           >
           <el-button @click="cancel">取 消</el-button>
         </div>
@@ -781,7 +807,7 @@
         <span slot="footer" class="dialog-footer">
           <el-button @click="detailShow = false">取 消</el-button>
           <el-button type="primary" @click="detailPrintHandler"
-            >打 印</el-button
+          >打 印</el-button
           >
         </span>
       </el-dialog>
@@ -871,6 +897,7 @@ import OutStock from "@/views/orderMange/components/dialogForm/OutStock.vue";
 import OutStockDetail from "@/views/orderMange/components/dialogForm/OutStockDetail.vue"; //拆分零售订单与普通订单
 import oldOutBound from "@/views/orderMange/components/dialogForm/oldOutBound.vue";
 import { numToCapital } from "@/utils/other";
+import {getOptionLsit} from "@/api/codeListManage/productCodeList";
 
 export default {
   name: "listInfo",
@@ -904,6 +931,7 @@ export default {
 
       // 出库单  end
       myDelIds: [], //新增接口 删除的id
+      dropDownData: {},
       // 详情弹窗数据
       detailShow: false,
       printDomData: "",
@@ -946,6 +974,7 @@ export default {
         colourNumberLabel: "",
         colours: "", //色号
         remark: "", //备注
+        level: "", //等级
         // 工艺表
         craftGrid: "", //网络
         craftOil: "", //油剂
@@ -959,6 +988,7 @@ export default {
       sliceTypeOptions: [], //切片型号选项
       colourNumberOptions: [], //色号选项
       allProductionOptions: [], //所有产品选项
+      levelOptions: [], //等级选项
       productionOptions: [],
       customerOptions: [],
       productionTableData: [
@@ -1258,6 +1288,34 @@ export default {
         this.productionOptions = this.allProductionOptions.slice(0, 500);
       }
     },
+    // 获取下拉数据
+    async getSelectOptions() {
+      try {
+        let res = await getOptionLsit();
+        if (res.code == 200) {
+          this.dropDownData = res.data || {};
+          // 初始化默认值
+          if (this.dropDownData.level?.length > 0 && this.excuteType == 1) {
+            this.formData.level = this.dropDownData.level[0].codeName;
+          }
+        } else {
+          this.$message.error("网络异常!");
+        }
+      } catch (error) {}
+    },
+    // 等级改变回调
+    async levelChangeHandler() {
+      // return;
+      // 等级发生变化，重新获取码单号
+      this.tableData = []; //清空打印记录
+      let res = await getQrCode();
+      this.summertId = new Date().getTime(); //总码单id重新生成
+      if (res.code == 200) {
+        this.qrCode = res.msg;
+      } else {
+        this.$message.error(res.msg);
+      }
+    },
     // 出库单回调
     async myPrintOutBoundHandler(row, data) {
       console.log("row", row);
@@ -1296,7 +1354,6 @@ export default {
                 productName: item.productName,
                 productSpecifications: item.productSpecifications,
                 productColour: item.productColour,
-                productId: item.productId,
                 lotNumber: item.lotNumber,
                 weight: item.productNumber,
                 productPrice: item.productUnitPrice,
@@ -1405,6 +1462,7 @@ export default {
         sliceType: "", //切片类型
         sliceTypeLabel: "",
         colourNumberLabel: "",
+        level: "",//等级
         colours: "", //色号
         remark: "", //备注
         // 工艺表
@@ -1434,9 +1492,10 @@ export default {
           index === 1 ||
           index === 2 ||
           index === 3 ||
-          index === 7 ||
+          index === 4 ||
           index === 8 ||
-          index === 9
+          index === 9 ||
+          index === 10
         ) {
           sums[index] = "";
         } else if (!values.every((value) => isNaN(value))) {
@@ -1674,13 +1733,23 @@ export default {
       } catch (error) {
         console.log(error);
       }
+      //等级
+      try{
+        let res = await getOptionLsit();
+        if (res.code == 200) {
+          this.levelOptions = res.data.level;
+          console.log("----------------------",res.data.level)
+        } else {
+          this.$message.error("网络异常!");
+        }
+      }catch (error){}
     },
     //
     // 获取row-key
     getRowKey(row) {
       return row[
         camelCase(this.tableName + "_" + this.templateInfo.template?.primaryKey)
-      ];
+        ];
     },
     /** 查询列表 */
     getList(queryParams, orderType = 0) {
@@ -2223,7 +2292,7 @@ export default {
             sale_order[0];
           saleDate && (this.formData.saleDate = new Date(saleDate));
           saleOrderEstimatedTime &&
-            (this.formData.saleOrderEstimatedTime = saleOrderEstimatedTime);
+          (this.formData.saleOrderEstimatedTime = saleOrderEstimatedTime);
           deliveryDate && (this.formData.deliveryDate = new Date(deliveryDate));
 
           this.productIds = sale_products.map((item) => item.saleProductNo);
@@ -2393,9 +2462,9 @@ export default {
       this.$refs.mychild.pageList(
         row == undefined
           ? {
-              limit: this.queryParams.pageSize,
-              page: this.queryParams.pageNum,
-            }
+            limit: this.queryParams.pageSize,
+            page: this.queryParams.pageNum,
+          }
           : row
       );
     },
@@ -2530,7 +2599,7 @@ export default {
           }
 
           res.data.template.dfFormSql &&
-            (this.dynamicData = JSON.parse(res.data.template.dfFormSql));
+          (this.dynamicData = JSON.parse(res.data.template.dfFormSql));
           this.addRealFieldName(res.data.result.resultMap);
           let resultMap = res.data.result.resultMap;
 
@@ -2796,7 +2865,7 @@ export default {
     importTemplate() {
       this.download(
         process.env.VUE_APP_BASE_API1 +
-          `common/exportTemplate?tableName=${this.tableName}&sqlkey=${this.templateInfo.template.sqlKey}`,
+        `common/exportTemplate?tableName=${this.tableName}&sqlkey=${this.templateInfo.template.sqlKey}`,
         {},
         `下载模版名称${new Date().getTime()}.xlsx`
       );
@@ -2812,8 +2881,8 @@ export default {
       this.$refs.upload.clearFiles();
       this.$alert(
         "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
-          response.msg +
-          "</div>",
+        response.msg +
+        "</div>",
         "导入结果",
         { dangerouslyUseHTMLString: true }
       );
@@ -2911,7 +2980,7 @@ export default {
                   item.fieldValue
                     ? item.fieldValue
                     : this.currentRow[
-                        camelCase(item.fieldName.replace(".", "_"))
+                      camelCase(item.fieldName.replace(".", "_"))
                       ];
               });
               conditionData.forEach((item) => {
@@ -2919,7 +2988,7 @@ export default {
                   item.fieldValue
                     ? item.fieldValue
                     : this.currentRow[
-                        camelCase(item.fieldName.replace(".", "_"))
+                      camelCase(item.fieldName.replace(".", "_"))
                       ];
               });
             }
@@ -3299,42 +3368,43 @@ export default {
             <tbody>
                 <tr>
                     <td width="600px" colspan="4">合同号：${saleNo}</td>
-                    <td width="600px" colspan="5">日期：${saleDate.replace(
-                      "T",
-                      " "
-                    )}</td>
+                    <td width="600px" colspan="6">日期：${saleDate.replace(
+          "T",
+          " "
+        )}</td>
                 </tr>
                 <tr align="center">
                     <td width="300px" colspan="2">客户名称：</td>
                     <td width="300px" colspan="2">${customerName}</td>
                     <td width="300px" colspan="2">联系人：</td>
-                    <td width="150px" colspan="3">${contactPerson}</td>
+                    <td width="150px" colspan="4">${contactPerson}</td>
                 </tr>
                 <tr align="center">
                     <td width="300px" colspan="2">客户地址：</td>
                     <td width="300px" colspan="3">${customAddress}</td>
                     <td width="300px" colspan="2">客户国别：</td>
-                    <td width="300px" colspan="2">${customCountryType}</td>
+                    <td width="300px" colspan="3">${customCountryType}</td>
                 </tr>
                 <tr align="center">
                     <td width="300px" colspan="2">预计下单时间：</td>
                     <td  colspan="1">${saleOrderEstimatedTime.replace(
-                      "T",
-                      " "
-                    )}</td>
+          "T",
+          " "
+        )}</td>
                     <td  colspan="2">交货周期：</td>
                     <td >${saleLeadTime}</td>
                     <td  colspan="2">交货日期：</td>
-                    <td >${deliveryDate.replace("T", " ")}</td>
+                    <td colspan="2">${deliveryDate.replace("T", " ")}</td>
                 </tr>
                 <tr align="center">
-                    <td colspan="9">货品明细</td>
+                    <td colspan="10">货品明细</td>
                 </tr>
                 <tr align="center">
                     <td width="150px">品名</td>
                     <td width="100px">规格</td>
                     <td width="100px">类型</td>
                     <td width="100px">色号</td>
+                    <td width="100px">等级</td>
                     <td width="150px">数量/kg</td>
                     <td width="150px">单价</td>
                     <td width="150px">金额</td>
@@ -3373,6 +3443,7 @@ export default {
                     <td>${productSpecifications}</td>
                     <td>${productType}</td>
                     <td>${item.colourNumberLabel}</td>
+                    <td>${item.level}</td>
                     <td>${item.productNumber}</td>
                     <td>${item.productUnitPrice}</td>
                     <td>${item.productAmounts}</td>
@@ -3387,6 +3458,7 @@ export default {
            <td></td>
            <td></td>
           <td></td>
+          <td></td>
           <td>${amountTotal.toFixed(2)}</td>
           <td>${singlTotal.toFixed(2)}</td>
           <td>${moneyTotal.toFixed(2)}</td>
@@ -3394,7 +3466,7 @@ export default {
           <td></td>
         </tr>
                 <tr>
-                    <td colspan="9">合计金额（大写）：${saleAmountInWords}</td>
+                    <td colspan="10">合计金额（大写）：${saleAmountInWords}</td>
                 </tr>
                 `;
 
@@ -3402,17 +3474,17 @@ export default {
           //定金
           printStr += `
           <tr>
-            <td colspan="4">付款方式：${payType}</td>
+            <td colspan="5">付款方式：${payType}</td>
             <td colspan="5">定金：${earnestMoney}</td>
           </tr>`;
         } else {
           printStr += `
          <tr>
-              <td colspan="9">付款方式：${payType}</td>
+              <td colspan="10">付款方式：${payType}</td>
           </tr>`;
         }
         printStr += `<tr align="center">
-                    <td colspan="9">工艺要求</td>
+                    <td colspan="10">工艺要求</td>
                 </tr>
                 <tr align="center">
                     <td width="150px">网络</td>
@@ -3435,18 +3507,19 @@ export default {
                     <td width="150px"></td>
                     <td width="150px"></td>
                     <td width="150px"></td>
+                    <td width="150px"></td>
                 </tr>
                 <tr>
-                    <td colspan="9">包装/贴唛：${craftMark}</td>
+                    <td colspan="10">包装/贴唛：${craftMark}</td>
                 </tr>
                 <tr>
-                    <td colspan="9">装运方式：${shippingMethod}</td>
+                    <td colspan="10">装运方式：${shippingMethod}</td>
                 </tr>
                 <tr align="center">
                     <td colspan="2">业务员：</td>
                     <td colspan="2">${salesman}</td>
                     <td colspan="2">财务部：</td>
-                    <td colspan="3">${finance}</td>
+                    <td colspan="4">${finance}</td>
 
                 </tr>
 
@@ -3530,7 +3603,7 @@ export default {
     },
     // 出库明细回调
     handleOutDetail(row) {
-      this.stockTitle = "出库明细1";
+      this.stockTitle = "出库明细";
       this.outStockShow = true;
       this.$nextTick(() => {
         this.$refs.OutStockDetailRef.getOutStockDetail(row, false);
@@ -3671,7 +3744,7 @@ export default {
                 item.fieldValue
                   ? item.fieldValue
                   : this.currentRow[
-                      camelCase(item.fieldName.replace(".", "_"))
+                    camelCase(item.fieldName.replace(".", "_"))
                     ];
             });
           }

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

@@ -239,7 +239,7 @@
                     >出库明细
                   </el-button>
                 </el-dropdown-item>
-                <el-dropdown-item v-show="scope.row.status == 5">
+                <el-dropdown-item>
                   <el-button
                     size="mini"
                     type="text"
@@ -536,7 +536,7 @@
                   </el-select>
                 </template>
               </el-table-column>
-              <el-table-column prop="colours" width="150" label="色号">
+              <el-table-column prop="colours" width="150" label="色泽">
                 <template slot-scope="scope">
                   <el-form-item
                     :prop="'colours-' + scope.$index"
@@ -626,7 +626,7 @@
                   </el-form-item>
                 </template>
               </el-table-column>
-              <el-table-column prop="productUnitPrice" label="单价">
+              <el-table-column prop="productUnitPrice" label="单价/KG">
                 <template slot-scope="scope">
                   <el-form-item
                     :prop="'productUnitPrice-' + scope.$index"
@@ -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);
       });
     },
     // 出库详情回调

zkqy-ui/src/views/system/financialManage/receiveRecordReview.vue

@@ -336,7 +336,7 @@
                 v-model="form.settlementUnitId"
                 placeholder="请输入结算单位"
               >
-                
+
               </el-input> -->
               <el-select
                 disabled

zkqy-ui/src/views/system/financialManage/waitDetailsReview.vue

@@ -476,7 +476,6 @@ export default {
   methods: {
     // 审核通过回调
     passHandler(row) {
-      console.log(row);
       this.$confirm("是否通过该条数据的审批", "提示", {
         confirmButtonText: "通过",
         cancelButtonText: "取消",
@@ -542,7 +541,6 @@ export default {
     /** 查询应收账明细列表 */
     getList() {
       this.loading = true;
-      console.log("getList", this.queryParams);
       SaleAccountsReceivableDetailList(this.queryParams).then((response) => {
         this.SaleAccountsReceivableDetailList = response.rows;
         this.total = response.total;