品质异常单按需求调整

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

@@ -75,3 +75,9 @@ ALTER TABLE topsun_dev.sap_exception_duty_person MODIFY COLUMN person_name varch
 ALTER TABLE topsun_dev.sap_exception_duty_person MODIFY COLUMN dept_name varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '部门名称';
 ALTER TABLE topsun_dev.sap_exception_duty_person MODIFY COLUMN person_no varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '号/供应商编码/客户名编码';
 ALTER TABLE topsun_dev.sap_exception_report MODIFY COLUMN customer_order_no varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '客户单号';
+--2024-09-25  异常单增加长度
+ALTER TABLE topsun_dev.sap_exception_report MODIFY COLUMN exception_state varchar(3000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '异常陈诉';
+ALTER TABLE topsun_dev.sap_exception_report MODIFY COLUMN exception_reason varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '异常原因';
+ALTER TABLE topsun_dev.sap_exception_report MODIFY COLUMN deal_method varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '改善措施';
+ALTER TABLE topsun_dev.sap_exception_report MODIFY COLUMN deal_result varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '处理结果';
+ALTER TABLE topsun_dev.sap_exception_report MODIFY COLUMN remark varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '备注';

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

@@ -47,41 +47,66 @@ function initialize() {
     }
     $('#exceptionReasonType').combox({
         onChange: function (v) {
-            //alert(v.value+'===========');
-            if (v.value == 1) { //采购
-                //  $('#editDataSourceKindId').combox('setValue','4');
+            if (v.value == 1) { //供应商原料问题
+                if ($('#exceptionType').val()=="in"){
+                    Public.tip("供应商原料问题的异常类型只能是外部！");
+                    clearExceptionType();
+                    return false;
+                }
                 showPurchaseDiv();
             } else {
+                if ($('#exceptionType').val()=="out"){
+                    Public.tip("生产和客户异常的异常类型只能是内部！");
+                    clearExceptionType();
+                    return false;
+                }
                 showProduceDiv();
             }
         }
     });
+    $('#exceptionType').combox({
+        onChange: function (v) {
+            if (v.value == "in") { //内部
+                if ($('#exceptionReasonType').val()==1){
+                    Public.tip("供应商原料问题的异常类型只能是内部！");
+                    clearExceptionType();
+                     return false;
+                }
+            } else {
+                if ($('#exceptionReasonType').val()!=""&&$('#exceptionReasonType').val()!=1){
+                    Public.tip("生产和客户异常的异常类型只能是外部！");
+                    clearExceptionType();
+                    return false;
+                }
+            }
+        }
+    });
+}
+
+function clearExceptionType(){
+    $('#exceptionType').val("");
+    $('#exceptionType_text').val("");
 }
 
 function showProduceDiv() {
-  //  purchaseToolbarOptions={items: []};
-   // purchaseToolbarOptions={};
 
     $("#purchaseDiv").hide();
     $("#produceDiv").show();
-   // $("#customerNo").val("");
-   // $("#customerName").val("");
-  //  $("#customerOrderNo").val("");
+
     setPurchaseMustInput(false);
     setProduceMustInput(true);
 }
 
 function showPurchaseDiv() {
     $("#produceDiv").hide();
+   // var row = purchaseGridManager.rows;
+   // for (var u = 0; u < row.length; u++) {
+       // purchaseGridManager.deleteRow(purchaseGridManager.rows[u]);
+   // }
     purchaseGridManager.loadData();
-   // purchaseToolbarOptions={};
-  //  purchaseGridManager=null;
+
     $("#purchaseDiv").show();
 
-   // initPurchaseGrid();
-  //  $("#customerNo").val("");
-  //  $("#customerNamePur").val("");
-  //  $("#customerOrderNoPur").val("");
     setPurchaseMustInput(true);
     setProduceMustInput(false);
 }
@@ -215,7 +240,7 @@ function initProduceGrid() {
 }
 
 function countSumChange() {
-    if ($('#exceptionReasonType').val() == "3") {
+    if ($('#exceptionReasonType').val() == "1") {
         countSum(purchaseGridManager.rows);
     } else {
         countSum(itemGridManager.rows);
@@ -470,7 +495,7 @@ function getPurchaseGridColumns() {
         },
         {
             display: "单位", name: "unitName", width: "80", align: "left", type: "string"
-// ,editor: {type: "text"}
+            // ,editor: {type: "text"}
             , editor: {
                 required: true, type: "select",
                 data: {
@@ -500,11 +525,11 @@ function getPurchaseGridColumns() {
         },
         {
             display: "总金额", name: "totalMoney", width: "100", align: "left", type: "string"
-         },
-        {
-            display: "出货日期", name: "sendDate", width: "140", align: "left", type: "date"
-            , editor: {type: "date"}
-        }
+         }
+        // {
+        //     display: "出货日期", name: "sendDate", width: "140", align: "left", type: "date"
+        //     , editor: {type: "date"}
+        // }
     ]
     return columns;
 }

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

@@ -77,13 +77,13 @@
                 <x:fileList bizCode="exceptionStateInfo" bizId="attbizId" id="exceptionStateInfoList" title="相关资料" />
             </div>
             <div class="hg-form-row">
-                <x:textareaC name="exceptionState" required="false" label="异常陈诉" maxLength="120" labelCol="1" fieldCol="11" rows="3"/>
+                <x:textareaC name="exceptionState" required="false" label="异常陈诉" maxLength="2500" labelCol="1" fieldCol="11" rows="3"/>
             </div>
             <div class="hg-form-row">
-                <x:textareaC name="exceptionReason" required="false" label="异常原因" maxLength="120" labelCol="1" fieldCol="11" rows="3"/>
+                <x:textareaC name="exceptionReason" required="false" label="异常原因" maxLength="1500" labelCol="1" fieldCol="11" rows="3"/>
             </div>
             <div class="hg-form-row">
-                <x:textareaC name="dealMethod" required="false" label="改善措施" maxLength="120" labelCol="1" fieldCol="11" rows="3"/>
+                <x:textareaC name="dealMethod" required="false" label="改善措施" maxLength="1500" labelCol="1" fieldCol="11" rows="3"/>
             </div>
             <div class="hg-form-row">
                 <x:inputC name="dutyDeptName" label="责任部门" labelCol="1" fieldCol="2" required="false" wrapper="tree"/>
@@ -92,7 +92,7 @@
                 <x:hidden name="checkOperator"/>
             </div>
             <div class="hg-form-row">
-                <x:textareaC name="dealResult" required="false" label="处理结果" maxLength="120" labelCol="1" fieldCol="11" rows="3"/>
+                <x:textareaC name="dealResult" required="false" label="处理结果" maxLength="1500" labelCol="1" fieldCol="11" rows="3"/>
             </div>
             <div class="hg-form-row">
                 <x:inputC name="manager" label="单位主管" labelCol="1" fieldCol="2" required="false"/>
@@ -100,7 +100,7 @@
                 <x:inputC name="generalManager" label="经理" labelCol="1" fieldCol="2" required="false"/>
             </div>
             <div class="hg-form-row">
-                <x:textareaC name="remark" required="false" label="备注" maxLength="120" labelCol="1" fieldCol="11" rows="3"/>
+                <x:textareaC name="remark" required="false" label="备注" maxLength="800" labelCol="1" fieldCol="11" rows="3"/>
             </div>
         </div>
         <x:title title="责任人信息" name="group" hideTable="#info" />

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

@@ -264,7 +264,7 @@ function initItemGrid() {
 function getGridColumns1() {
 var columns1 = [];
 columns1 = [
-    { display: "采购订单", name: "purchaseNo", width: "160", align: "left", type: "string",
+    { display: "采购订单", name: "purchaseNo", width: "130", align: "left", type: "string",
        // editor: {required: true,type: 'text'}
        editor: {
         required: false, type: "select",
@@ -281,13 +281,63 @@ columns1 = [
           }
         }
     },
+    {
+        display: "产品名称", name: "productName", width: "200", align: "left", type: "string"
+        // , editor: {type: 'text', required: true}
+        ,editor: {
+            required: true, type: "select",
+            data: {
+                type: 'system',
+                name: "sapMaterialSelect",
+                getParam: function (item) {
+                    return {
+                        // filterValue:item.company
+                    }
+                },
+                back: {
+                    MATNR: "productCode",
+                    MAKTX: "productName",
+                    //  EKGRP: "ekgrp",
+                    MEINS: "unit",
+                    MSEHL: "unitName"
+
+                }
+            }
+        }
+    },
+    {
+        display: "产品编码", name: "productCode", width: "160", align: "left", type: "string"
+        //, editor: {type: 'text', required: true}
+    },
+    {
+        display: "数量", name: "number", width: "100", align: "left", type: "string"
+        , editor: {type: "text", mask: '9999999.999'}
+    },
+    {
+        display: "单位", name: "unitName", width: "80", align: "left", type: "string"
+        // ,editor: {type: "text"}
+        , editor: {
+            required: true, type: "select",
+            data: {
+                type: 'system',
+                name: "dictionary",
+                getParam: function (item) {
+                    return {fieldName: "MEINS"}
+                },
+                back: {
+                    MSEH3: "unit",
+                    MSEHL: "unitName"
+                }
+            }
+        }
+    },
     {display: "金额", name: "money", width: "100", align: "left", type: "string"
         ,editor: {required: true,type: "text",mask: '9999999.999'}
     },
     {display: "日期", name: "sendDate", width: "140", align: "left", type: "date"
         ,editor: {type: "date"}
     },
-    {display: "备注", name: "remark", width: "350", align: "left", type: "string"
+    {display: "备注", name: "remark", width: "280", align: "left", type: "string"
         ,editor: {type: 'text',required:false}
     }]
    return columns1;

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

@@ -32,6 +32,11 @@
         <x:hidden name="manager"/>
         <x:hidden name="deputyManager"/>
         <x:hidden name="generalManager"/>
+        <x:hidden name="generalManager"/>
+        <x:hidden name="checkOperator"/>
+        <x:hidden name="checkOperatorName"/>
+        <x:hidden name="dutyDept"/>
+        <x:hidden name="dutyDeptName"/>
         <div class="hg-form-cols">
             <c:if test="${statusId==1||statusId==3}">
             <div style="float: right; margin-right: 10px;" class="btn-group" id="buttonBox">
@@ -63,7 +68,7 @@
                 <x:inputC name="sapBillNo" label="SAP单据号" labelCol="1" fieldCol="2" required="false" readonly="true"/>
             </div>
             <div class="hg-form-row">
-                <x:textareaC name="exceptionState" required="false" label="异常描述" maxLength="120" labelCol="1" fieldCol="11" rows="3"/>
+                <x:textareaC name="exceptionState" required="false" label="异常描述" maxLength="2500" labelCol="1" fieldCol="11" rows="3"/>
             </div>
         </div>
         <div class="hg-form-cols" >
@@ -87,16 +92,16 @@
         <x:title title="处理方式:特殊处理" name="group"/>
         <div class="hg-form-cols">
           <div class="hg-form-row">
-            <x:textareaC name="dealMethod" required="false" label="特殊处理" maxLength="120" labelCol="1" fieldCol="11" rows="2" readonly="false"/>
+            <x:textareaC name="dealMethod" required="false" label="特殊处理" maxLength="1500" labelCol="1" fieldCol="11" rows="2" readonly="false"/>
           </div>
         </div>
         </div>
         <div class="hg-form-cols">
             <div class="hg-form-row">
-                <x:textareaC name="dealResult" required="false" label="处理结果" maxLength="120" labelCol="1" fieldCol="11" rows="2" readonly="false"/>
+                <x:textareaC name="dealResult" required="false" label="处理结果" maxLength="1500" labelCol="1" fieldCol="11" rows="2" readonly="false"/>
             </div>
             <div class="hg-form-row">
-                <x:textareaC name="remark" required="false" label="备注" maxLength="120" labelCol="1" fieldCol="11" rows="2"/>
+                <x:textareaC name="remark" required="false" label="备注" maxLength="800" labelCol="1" fieldCol="11" rows="2"/>
             </div>
             <div style="padding-top: 15px;">
                 <x:fileList bizCode="exceptionStateInfo" bizId="attbizId" id="exceptionStateInfoList" title="相关资料" />

topsun-xt/src/main/webapp/template/exceptionReport.ftl

@@ -178,7 +178,7 @@
                 <p class="p1"><span style="font-weight:bolder ">异常陈述</span></p>
             </td>
             <td  class="td2" style="width:90%">
-                <p class="p1" style="width:auto"><span>${(head.exceptionState)!' '}</span></p>
+                <p class="p1" style="width:auto"><span class="autoLine">${(head.exceptionState)!' '}</span></p>
             </td>
         </tr>
     </table>
@@ -188,7 +188,7 @@
             <p class="p1"><span style="font-weight:bolder ">发生原因</span></p>
         </td>
         <td  class="td2" style="width:90%">
-            <p class="p1" style="width:auto"><span>${(head.exceptionReason)!' '}</span></p>
+            <p class="p1" style="width:auto"><span class="autoLine">${(head.exceptionReason)!' '}</span></p>
             </td>
         </tr>
     </table>
@@ -198,7 +198,7 @@
             <p class="p1"><span style="font-weight:bolder ">改善措施</span></p>
         </td>
           <td  class="td2" style="width:90%">
-              <p class="p1" style="width:auto"><span>${(head.dealMethod)!' '}</span></p>
+              <p class="p1" style="width:auto"><span class="autoLine">${(head.dealMethod)!' '}</span></p>
             </td>
         </tr>
     </table>
@@ -226,7 +226,7 @@
             <p class="p1"><span style="font-weight:bolder ">处理结果</span></p>
         </td>
         <td  class="td2" style="width:90%">
-            <p class="p1" style="width:auto"><span>${(head.dealResult)!' '}</span></p>
+            <p class="p1" style="width:auto"><span class="autoLine">${(head.dealResult)!' '}</span></p>
           </td>
 
         </tr>
@@ -259,7 +259,7 @@
             <p class="p1"><span style="font-weight:bolder ">备注</span></p>
         </td>
            <td  class="td2" style="width:90%">
-               <p class="p1"><span style="">${(head.remark)!' '}</span></p>
+               <p class="p1" style="width:auto"><span class="autoLine">${(head.remark)!' '}</span></p>
             </td>
 
         </tr>

topsun-xt/src/main/webapp/template/exceptionReportSupplier.ftl

@@ -197,7 +197,7 @@
                 <p class="p1"><span style=" font-weight:bolder ">异常描述</span></p>
             </td>
             <td class="td2" style="width: 90%">
-                <p class="p1" style="width: auto"><span>${(head.exceptionState)!' '}</span></p>
+                <p class="p1" style="width: auto"><span class="autoLine">${(head.exceptionState)!' '}</span></p>
             </td>
         </tr>
     </table>
@@ -207,7 +207,7 @@
             <p class="p1"><span style="font-weight:bolder ">发生原因</span></p>
         </td>
         <td  class="td2" style="width:90%">
-            <p class="p1" style="width:auto"><span>${(head.exceptionReason)!' '}</span></p>
+            <p class="p1" style="width:auto"><span class="autoLine">${(head.exceptionReason)!' '}</span></p>
         </td>
     </tr>
     </table>
@@ -217,7 +217,7 @@
                 <p class="p1"><span style="font-weight:bolder ">改善措施</span></p>
             </td>
             <td  class="td2" style="width:90%">
-                <p class="p1" style="width:auto"><span>${(head.dealMethod)!' '}</span></p>
+                <p class="p1" style="width:auto"><span class="autoLine">${(head.dealMethod)!' '}</span></p>
             </td>
         </tr>
     </table>
@@ -249,7 +249,7 @@
                 <p class="p1"><span style="font-family:SimSun; font-weight:bolder ">处理结果</span></p>
             </td>
             <td class="td2" style="width: 90%">
-                <p class="p1" style="width: auto"><span style="">${(head.dealResult)!' '}</span></p>
+                <p class="p1" style="width: auto"><span class="autoLine">${(head.dealResult)!' '}</span></p>
             </td>
 
         </tr>
@@ -261,7 +261,7 @@
                 <p class="p1"><span style="font-weight:bolder ">备注</span></p>
             </td>
             <td class="td2" style="width: 90%">
-                <p class="p1" style="width: auto"><span style="">${(head.remark)!' '}</span></p>
+                <p class="p1" style="width: auto"><span class="autoLine">${(head.remark)!' '}</span></p>
             </td>
 
         </tr>

topsun/src/main/java/com/huigou/topsun/sap/exceptionReport/application/impl/ExceptionReportApplicationImpl.java

@@ -477,11 +477,16 @@ public class ExceptionReportApplicationImpl extends FlowBroker implements Except
                suppExceptionReport.setDeputyManager(exceptionReport.getDeputyManager());
                suppExceptionReport.setGeneralManager(exceptionReport.getGeneralManager());
 
+               suppExceptionReport.setDutyDept(exceptionReport.getDutyDept());
+               suppExceptionReport.setDutyDeptName(exceptionReport.getDutyDeptName());
+               suppExceptionReport.setCheckOperator(exceptionReport.getCheckOperator());
+               suppExceptionReport.setCheckOperatorName(exceptionReport.getCheckOperatorName());
+
                suppExceptionReport.setLoseMoney(exceptionReport.getLoseMoney());
                suppExceptionReport.setAttbizId(exceptionReport.getAttbizId());
                suppExceptionReport.setDealWay("special");
 
-                Operator operator = ThreadLocalUtil.getOperator();
+                Operator operator = operatorApplication.createOperatorByPersonMemberId(exceptionReport.getCheckOperator());
                 suppExceptionReport.setPersonMemberId(operator.getPersonMemberId());
                 suppExceptionReport.setPersonMemberName(operator.getPersonMemberName());
 
@@ -612,7 +617,7 @@ public class ExceptionReportApplicationImpl extends FlowBroker implements Except
                 List<ExceptionReportResponsible> rslist = exceptionReportResponsibleRepository.findByExceptionReportId(exceptionReport.getId());
                 if (!ObjectUtils.isEmpty(rslist)) {
                     ExceptionReportResponsible lastResponsible = rslist.get(rslist.size() - 1);
-                    if (!lastResponsible.getCheckOperator().equals(exceptionReport.getCheckOperator())) {
+                    if (exceptionReport.getCheckOperator()!=null&&!lastResponsible.getCheckOperator().equals(exceptionReport.getCheckOperator())) {
                         saveHistoryCheckOperator(exceptionReport);
                     }
                 } else {
@@ -632,6 +637,17 @@ public class ExceptionReportApplicationImpl extends FlowBroker implements Except
         if (destActivityId.equalsIgnoreCase("apply")) {
             updateStatus(bizId, BizBillStatus.APPLYING);
         }
+        //回退删除责任人历史记录
+        ExceptionReport exceptionReport=this.exceptionReportRepository.findOne(bizId);
+        if (StringUtils.isNotBlank(exceptionReport.getDutyDept())) { //责任部门不为空
+            List<ExceptionReportResponsible> rslist = exceptionReportResponsibleRepository.findByExceptionReportId(exceptionReport.getId());
+            if (!ObjectUtils.isEmpty(rslist)) {
+                ExceptionReportResponsible lastResponsible = rslist.get(rslist.size() - 1);
+                if (exceptionReport.getCheckOperator()!=null&&lastResponsible.getCheckOperator().equals(exceptionReport.getCheckOperator())) {
+                    exceptionReportResponsibleRepository.delete(lastResponsible);
+                }
+            }
+        }
     }
 
     /**

topsun/src/main/java/com/huigou/topsun/sap/sapApplication/application/impl/SapMaterialApplicationImpl.java

@@ -127,8 +127,8 @@ public class SapMaterialApplicationImpl implements SapMaterialApplication {
          } else if  (StringUtils.isNotBlank(queryRequest.getKunnr())) {  //查询订单号
              for (Map map : mapList) {
                  Map newMap = new HashMap();
-                 newMap.put("VBELN", map.get("VBELN"));
-                // newMap.put("VBELN", map.get("BSTNK"));  09.21冯要求改为BSTNK
+                 //newMap.put("VBELN", map.get("VBELN"));
+                 newMap.put("VBELN", map.get("BSTNK"));  //09.21冯朝阳要求改为BSTNK
                  newMap.put("KUNNR", map.get("KUNNR"));
                  newMap.put("NAME1", map.get("NAME1"));
                  sapOrderVoList.add(newMap);