工序外协申请中的供应商需要在已完成工序报价的供应商中选择；工序外协增加发运状态；

huigou-xt/src/main/webapp/template/simple/taskExecutionList.ftl

@@ -78,7 +78,7 @@
 		<div class='ui-text-label'>
 			<#if task.handledDate?? && task.handledDate?trim?length gt 0>
 				<#--<#if task.autoApproval == 1>${task.handledDate?string("yyyy-MM-dd")}</div><#rt/>-->
-				<#if parameters.pi?size gt 0 && parameters.pi?? && parameters.pi.processDefinitionKey == "ssrfPurchaseMoneyProc">${task.handledDate?string("yyyy-MM-dd")}</div><#rt/>
+				<#if parameters.pi?size gt 0 && parameters.pi??>${task.handledDate?string("yyyy-MM-dd")}</div><#rt/>
 				<#else >
 					${task.handledDate?html}</div><#rt/>
 				</#if>

topsun-xt/src/main/resources/application.properties

@@ -3,13 +3,7 @@ pub.db.url=jdbc:mysql://192.168.3.91:3406/topsun_dev?serverTimezone=GMT%2B8&useU
 #pub.db.url=jdbc:mysql://192.168.3.91:3406/topsun_320?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&useSSL=false
 pub.db.user=root
 pub.db.password=123456
-#pub.db.url=jdbc:mysql://127.0.0.1:3306/topsun?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&useSSL=false
-#pub.db.user=topsun
-#pub.db.password=topsun
 
-#log.db.url=jdbc:mysql://127.0.0.1:3306/topsun?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&useSSL=false
-#log.db.user=topsun
-#log.db.password=topsun
 log.db.url=jdbc:mysql://192.168.3.91:3406/topsun_dev?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&useSSL=false
 #log.db.url=jdbc:mysql://192.168.3.91:3406/topsun_test?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&useSSL=false
 #log.db.url=jdbc:mysql://192.168.3.91:3406/topsun_320?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&useSSL=false

topsun-xt/src/main/resources/数据库变更记录

@@ -158,3 +158,7 @@ ADD COLUMN `PRODUCT_TYPE_NAME` varchar(32) NULL COMMENT '产品类别描述' AFT
 --2024-11-04  品质异常单增加汇率
 ALTER TABLE `topsun_dev`.`sap_exception_report_item`
 ADD COLUMN `exchange_rate` decimal(10, 2) NULL DEFAULT NULL COMMENT '汇率' AFTER `exception_number`;
+
+--2024-11-12  外协工序增加已外发状态
+ALTER TABLE `topsun_dev`.`sap_process_outsource`
+ADD COLUMN `send_out` varchar(1) NULL COMMENT '已外发 1' AFTER `situation_desc`;

topsun-xt/src/main/webapp/biz/topsun/sap/exceptionReport/exceptionReportDetail.js

@@ -98,6 +98,17 @@ function initialize() {
             }
         }
     });
+
+    $('#customerNo').searchbox({
+        type: "system", name: "dictionary",
+        getParam: function (item) {
+            return {fieldName: "KUNNR"}
+        },
+        onChange: function (value, data) {
+            $('#customerNo').val(data.KUNNR);
+            $('#customerName').val(data.NAME);
+        }
+    });
 }
 
 function clearExceptionType(){

topsun-xt/src/main/webapp/biz/topsun/sap/exceptionReport/exceptionReportDetail.jsp

@@ -65,7 +65,7 @@
          </div>
         <div class="hg-form-cols" id="produceDiv">
             <div class="hg-form-row">
-             <x:inputC name="customerNo" label="客户编号" labelCol="1" fieldCol="2" required="false"/>
+             <x:inputC name="customerNo" label="客户编号" labelCol="1" fieldCol="2" required="false" wrapper="select"/>
              <x:inputC name="customerOrderNo" label="生产单号/客户单号" labelCol="2" fieldCol="4" wrapper="select" required="false"/>
              <x:inputC name="customerName" label="客户名称" labelCol="1" fieldCol="2" required="false" readonly="true"/>
             </div>

topsun-xt/src/main/webapp/biz/topsun/sap/processOutsource/processOutsourceDetail.js

@@ -250,12 +250,16 @@ function getOrderColumns(){
                 required: true, type: "select",
                 data: {
                     type: 'suppliers',
-                    name: "selectSuppliers",
+                    name: "selectQuotedSuppliers",
                     getParam: function (item) {
+                        return {
+                            productCode: item.productCode,
+                            outProcess: item.wempf
+                        }
                     },
                     back: {
-                        partner: "lifnr",
-                        nameOrg1: "lifnrName",
+                        supplier: "lifnr",
+                        supplierName: "lifnrName",
                     }
                 }
             }

topsun-xt/src/main/webapp/biz/topsun/sap/processOutsource/processOutsourceList.js

@@ -13,12 +13,22 @@ function loadProcessOutsourceOrderListGrid() {
     var toolbarOptions = UICtrl.getDefaultToolbarOptions({
         addHandler: function (){
             addHandler()
+        },
+        sendOutHandler: {
+            id: 'sendOutHandler', text: '已外发', img:'fa-clipboard', click: function(){
+                sendOutHandler();
             }
+        },
     });
     gridManager = UICtrl.grid("#processOutsourceOrderGrid", {
         columns: [
             {display: "申请单编号", name: "billCode", width: 120, minWidth: 60, type: "string", align: "left"},
             {display: "申请状态", name: "statusTextView", width: 60, minWidth: 60, type: "string", align: "left"},
+            {display: "外发状态", name: "sendOut", width: 60, minWidth: 60, type: "string", align: "left",
+                render: function (item) {
+                    return item.sendOut == 1 ? "已外发": "";
+                }
+            },
             {display: "申请日期", name: "fillinDate", width: 120, minWidth: 60, type: "datetime", align: "left"},
             {display: "工厂", name: "werksName", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "采购订单", name: "ebeln", width: 120, minWidth: 60, type: "string", align: "left"},
@@ -123,3 +133,20 @@ function doView(processOutsourceId) {
         url: web_app.name + '/processOutsource/showProcessOutsourceDetail.job?isReadOnly=true&bizId='+processOutsourceId
     });
 }
+
+function sendOutHandler(){
+    var rows = gridManager.getSelectedRows();
+    if (rows.length == 0) {
+        Public.tip('请选择数据!');
+        return;
+    }
+    var ids = [];
+    for (var i = 0; i < rows.length; i++){
+        var row=rows[i];
+        ids.push(row.processOutsourceId)
+    }
+    Public.ajax(web_app.name + "/processOutsource/sendOutProcess.ajax",{ids:$.toJSON(ids)},function () {
+        reloadGrid();
+    })
+
+}
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/sap/processOutsource/application/ProcessOutsourceApplication.java

@@ -3,6 +3,7 @@ package com.huigou.topsun.sap.processOutsource.application;
 import com.huigou.topsun.sap.processOutsource.domain.ProcessOutsource;
 import com.huigou.topsun.sap.processOutsource.domain.query.ProcessOutsourceQueryRequest;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -19,4 +20,5 @@ public interface ProcessOutsourceApplication {
 
     ProcessOutsource loadProcessOutsource(String id);
 
+    void updateProcessOutStatus(List<String> ids);
 }

topsun/src/main/java/com/huigou/topsun/sap/processOutsource/application/impl/ProcessOutsourceApplicationImpl.java

@@ -339,5 +339,14 @@ public class ProcessOutsourceApplicationImpl extends FlowBroker implements Proce
         return processOutsourceRepository.findOne(id);
     }
 
+    @Override
+    public void updateProcessOutStatus(List<String> ids) {
+        List<ProcessOutsource> outsourceList = processOutsourceRepository.findAll(ids);
+        for (ProcessOutsource processOutsource : outsourceList) {
+            processOutsource.setSendOut("1");
+        }
+        processOutsourceRepository.save(outsourceList);
+    }
+
 
 }

topsun/src/main/java/com/huigou/topsun/sap/processOutsource/controller/ProcessOutsourceController.java

@@ -98,4 +98,11 @@ public class ProcessOutsourceController extends CommonController {
         processOutsourceOrderItemApplication.deleteByIds(ids);
         return success();
     }
+
+    public String sendOutProcess(){
+        SDO sdo = this.getSDO();
+        List<String> ids = sdo.getIds();
+        processOutsourceApplication.updateProcessOutStatus(ids);
+        return success();
+    }
 }

topsun/src/main/java/com/huigou/topsun/sap/processOutsource/domain/ProcessOutsource.java

@@ -29,6 +29,12 @@ public class ProcessOutsource extends FlowBillAbstractEntity {
     @Column(name = "situation_desc")
     private String situationDesc;
 
+    /**
+     * 已外发 1
+     */
+    @Column(name = "send_out")
+    private String sendOut;
+
     @Override
     protected String getCodeRuleId() {
         return "processOutsource";

topsun/src/main/resources/config/content/easysearch/easy-search-suppliers.xml

@@ -17,4 +17,19 @@
         <condition column="name_org1" name="nameOrg1" symbol="like" alias="t"/>
     </easy-search>
 
+    <easy-search name="selectQuotedSuppliers" desc="已报价供应商">
+        <sql>
+            SELECT
+             p.supplier,
+             p.supplier_name
+             FROM
+             sap_process_quoted_price p left join sap_process_quoted_price_item pi on p.id = pi.process_quoted_price_id
+             WHERE p.`status` =3
+        </sql>
+        <field name="供应商编码" title="供应商编码" code="supplier" width="100"/>
+        <field name="供应商名称" title="供应商名称" code="supplierName" width="200"/>
+        <condition column="product_code" name="productCode" symbol="=" alias="pi"/>
+        <condition column="out_process" name="outProcess" symbol="=" alias="pi"/>
+    </easy-search>
+
 </easy-search-mappings>
\ No newline at end of file

topsun/src/main/resources/config/topsun/sap/processOutsource/processOutsource.xml

@@ -9,7 +9,8 @@
              t.bill_code,
              t.`status`,
              t.person_member_name,
-             t.dept_name
+             t.dept_name,
+             t.send_out
              FROM sap_process_outsource_order_item ot
              LEFT JOIN sap_process_outsource t ON t.id = ot.process_outsource_id where 1=1
         </sql-query>