品质异常单按需求调整

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

@@ -67,3 +67,11 @@ DEFAULT CHARSET=utf8mb4
 COLLATE=utf8mb4_general_ci;
 --2024-09-19 异常单增加产品类别字段
 ALTER TABLE topsun_dev.sap_exception_report ADD product_type varchar(100) NULL COMMENT '产品类别';
+
+-- 2024-09-23 异常单增加来源单据编号
+ALTER TABLE topsun_dev.sap_exception_report ADD source_bill_code varchar(100) NULL COMMENT '来源单据编号';
+--2024-09-24  异常单责任明细增加长度
+ALTER TABLE topsun_dev.sap_exception_duty_person MODIFY COLUMN person_name varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '姓名/供应商名称/客户名';
+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 '客户单号';

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

 var itemGridManager, purchaseGridManager, dutyPersonGridManager = null
+var colRowNum =2;
 $(function () {
     initialize();
     initProduceGrid();
@@ -39,7 +40,7 @@ function initialize() {
             $('#dutyDept').val(data.deptId);
         }
     });
-    if ($('#exceptionReasonType').val() == "3") {
+    if ($('#exceptionReasonType').val() == "1") {
         showPurchaseDiv();
     } else {
         showProduceDiv();
@@ -47,7 +48,7 @@ function initialize() {
     $('#exceptionReasonType').combox({
         onChange: function (v) {
             //alert(v.value+'===========');
-            if (v.value == 3) { //采购
+            if (v.value == 1) { //采购
                 //  $('#editDataSourceKindId').combox('setValue','4');
                 showPurchaseDiv();
             } else {
@@ -149,10 +150,10 @@ function initProduceGrid() {
     });
     var toolbarOptions = UICtrl.getDefaultToolbarOptions({
         addHandler: function () {
-            if (Public.isBlank($('#customerOrderNo').val())) {
+           /* if (Public.isBlank($('#customerOrderNo').val())) {
                 Public.tip("请先输入客户订单号！")
                 return false
-            }
+            }*/
             UICtrl.addGridRow(itemGridManager);
         },
         deleteHandler: function () {
@@ -174,7 +175,7 @@ function initProduceGrid() {
         dataAction: 'server',
         url: web_app.name + '/exceptionReport/slicedExceptionReportItemList.ajax',
         parms: {exceptionReportId: getId()},
-        height: '300px',
+        height:'auto', // colRowNum*35+90
         heightDiff: -4,
         sortName: 'id',
         sortOrder: 'asc',
@@ -224,6 +225,10 @@ function getGridColumns() {
                     type: 'system',
                     name: "sapCustomerProduceNo",
                     getParam: function (item) {
+                        if (Public.isBlank($('#customerOrderNo').val())) {
+                            Public.tip("请先输入客户订单号！")
+                            return false;
+                        }
                         return {
                             werks: $("#werks").val(),
                             kunnr: $("#customerNo").val(),
@@ -305,7 +310,7 @@ function initDutyPersonGridGrid() {
             dataAction: 'server',
             url: web_app.name + '/exceptionReport/slicedExceptionReportDutyPersonList.ajax',
             parms: {exceptionReportId: getId()},
-            height: '300px',
+            height: 'auto',
             heightDiff: -4,
             sortName: 'id',
             sortOrder: 'asc',
@@ -347,7 +352,7 @@ function initPurchaseGrid() {
         dataAction: 'server',
         url: web_app.name + '/exceptionReport/slicedExceptionReportItemList.ajax',
         parms: {exceptionReportId: getId()},
-        height: '300px',
+        height: 'auto',
         heightDiff: -4,
         sortName: 'id',
         sortOrder: 'asc',
@@ -383,18 +388,52 @@ function getPurchaseGridColumns() {
     columns = [
         {
             display: "采购单号", name: "produceNo", width: "160", align: "left", type: "string",
-            editor: {type: 'text', required: true}
+           // editor: {type: 'text', required: true}
+            editor: {
+                required: false, type: "select",
+                data: {
+                    type: 'system',
+                    name: "dictionary",
+                    getParam: function (item) {
+                        return {fieldName: "EKKO"}
+                    },
+                    back: {
+                        EBELN: "produceNo"
+                        // MSEHL: "unitName"
+                    }
+                }
+            }
         },
         // {display: "产品类别", name: "productType", width: "160", align: "left", type: "string"
         //     ,editor: {type: 'text',required:true}
         // },
         {
-            display: "产品编码", name: "productCode", width: "160", align: "left", type: "string"
-            , editor: {type: 'text', required: true}
+            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: "productName", width: "200", align: "left", type: "string"
-            , editor: {type: 'text', required: true}
+            display: "产品编码", name: "productCode", width: "160", align: "left", type: "string"
+            //, editor: {type: 'text', required: true}
         },
         {
             display: "数量", name: "number", width: "100", align: "left", type: "string"
@@ -415,7 +454,7 @@ function getPurchaseGridColumns() {
                         MSEH3: "unit",
                         MSEHL: "unitName"
                     }
-                },
+                }
             }
         },
         {
@@ -502,7 +541,7 @@ function getExtendedData(processAction) {
     }
     var extendedData = {};
     var _grid = UICtrl.getGridManager('#maingrid');
-    if ($('#exceptionReasonType').val() == "3") { //采购异常
+    if ($('#exceptionReasonType').val() == "1") { //供应商材料问题
         _grid = UICtrl.getGridManager('#purchasegrid');
     }
     if (_grid) {

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

@@ -105,7 +105,7 @@ function initItemGrid() {
     });
 
     //物料编码
-    $('#maktx').searchbox({
+    /*$('#maktx').searchbox({
         type: "system", name: "sapMaterialSelect",
         getParam: function (item) {
             return {
@@ -115,12 +115,6 @@ function initItemGrid() {
         onChange: function (value, data) {
             $('#matnr').val(data.MATNR);
             $('#maktx').val(data.MAKTX);
-           // $('#matkl').val(data.MATKL); // alert(data.MATKL+"--"+data.WGBEZ);
-           // $('#matklName').val(data.WGBEZ);
-          //  $('#ekgrp').val(data.EKGRP);
-          //  $('#ekgrpName').val(data.EKNAM);
-         //   $('#bprme').val(data.MEINS);
-          //  $('#bprmeName').val(data.MSEHL);
         }
     });
     $('#customerOrderNo').searchbox({
@@ -132,7 +126,7 @@ function initItemGrid() {
            $('#customerOrderNo').val(data.EBELN);
        }
    });
-   /*$('#customerName').searchbox({
+   $('#customerName').searchbox({
        type: "system", name: "sapCustomerOrderSelect",
        getParam: function (item) {
            if (Public.isBlank($('#werksName').val())){

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

@@ -28,6 +28,10 @@
         <x:hidden name="personMemberName"/>
         <x:hidden name="exceptionType" value="out"/>
         <x:hidden name="frgdt"/>
+        <x:hidden name="werks"/>
+        <x:hidden name="manager"/>
+        <x:hidden name="deputyManager"/>
+        <x:hidden name="generalManager"/>
         <div class="hg-form-cols">
             <c:if test="${statusId==1||statusId==3}">
             <div style="float: right; margin-right: 10px;" class="btn-group" id="buttonBox">
@@ -50,9 +54,9 @@
             </div>
             <div class="hg-form-row">
                 <x:inputC name="matnr" label="材料编码" labelCol="1" fieldCol="2" required="false" readonly="true"/>
-                <x:inputC name="maktx" label="材料名称" labelCol="1" fieldCol="2" required="true"  wrapper="select"/>
+                <x:inputC name="maktx" label="材料名称" labelCol="1" fieldCol="2" required="false"  readonly="true"/>
 
-                <x:inputC name="customerOrderNo" label="采购单号" labelCol="1" fieldCol="2" required="true" wrapper="select"/>
+                <x:inputC name="customerOrderNo" label="采购单号" labelCol="1" fieldCol="2" required="false"  readonly="true"/>
 
                 <x:inputC name="loseMoney" label="损失金额" labelCol="1" fieldCol="2" required="true" mask="nnnnnn.nn" />
                 <x:selectC name="statusId" label="处理进度" labelCol="1" fieldCol="2" disabled="true" required="false" dictionary="bizBillStatus"/>

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

@@ -96,6 +96,7 @@ function initGrid() {
             fixedCellHeight: true,
             selectRowButtonOnly: true,
             enableObjectBag: true,
+        allowAdjustColWidth: true,
             onSuccess: function (data) {
                 if (data.error) {
                     Public.tip(data.error);

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

@@ -15,6 +15,7 @@
         .td1{border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; vertical-align:top; width:40pt}
         .td2{border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid;border-top-width:0.75pt;vertical-align:top;width:100pt}
         .p1{margin:5pt; orphans:0; widows:0;width:60pt}
+        .autoLine{word-break:normal; width:auto; display:block; word-wrap: break-word ;overflow: hidden;line-height:1}
     </style></head>
 <body>
 <div>
@@ -74,21 +75,21 @@
             <td class="td2" style="width:90%">
                 <#if (itemList)??  && ((itemList)?size > 0)>
                 <#list itemList as list>
-                <p class="p1"  style="width:auto" ><span>${(list.produceNo)!' '}</span></p>
+                <p class="p1"  style="width:auto" ><span class="autoLine">${(list.produceNo)!' '}</span></p>
                 </#list>
                 </#if>
             </td>
         </tr>
     </table>
     <table>
-        <tr>
+        <tr style="height: 30pt">
             <td class="td1">
                 <p class="p1"><span style="font-weight:bolder ">产品编号</span></p>
             </td>
             <td class="td2" >
                 <#if (itemList)??  && ((itemList)?size > 0)>
                 <#list itemList as list>
-                <p class="p1" style="width:90pt" ><span>${(list.productCode)!' '}</span></p>
+                <p class="p1" style="width:90pt" ><span class="autoLine">${(list.productCode)!' '}</span></p>
                 </#list>
                 </#if>
             </td>
@@ -98,7 +99,7 @@
             <td class="td2" style="width:90%">
                 <#if (itemList)??  && ((itemList)?size > 0)>
                 <#list itemList as list>
-                <p class="p1"  style="width:auto" ><span>${(list.productName)!' '}</span></p>
+                <p class="p1"  style="width:auto" ><span class="autoLine">${(list.productName)!' '}</span></p>
                 </#list>
                 </#if>
             </td>
@@ -155,10 +156,10 @@
             <td class="td1">
                 <p class="p1"><span style="font-weight:bolder ">折算金额</span></p>
             </td>
-            <td class="td2" style="width:50%">
+            <td class="td2">
                 <#if (itemList)??  && ((itemList)?size > 0)>
                 <#list itemList as list>
-                <p class="p1"  style="width:auto" ><span>${(list.rmbMoney)!' '}</span></p>
+                <p class="p1"  style="width:85pt" ><span>${(list.rmbMoney)!' '}</span></p>
                 </#list>
                 </#if>
             </td>
@@ -172,7 +173,7 @@
     </table>
 
     <table>
-        <tr>
+        <tr style="height: 80pt;">
             <td class="td1">
                 <p class="p1"><span style="font-weight:bolder ">异常陈述</span></p>
             </td>
@@ -182,7 +183,7 @@
         </tr>
     </table>
     <table >
-    <tr>
+    <tr  style="height: 80pt;">
         <td class="td1">
             <p class="p1"><span style="font-weight:bolder ">发生原因</span></p>
         </td>
@@ -192,7 +193,7 @@
         </tr>
     </table>
     <table>
-      <tr>
+      <tr style="height: 80pt;">
         <td class="td1">
             <p class="p1"><span style="font-weight:bolder ">改善措施</span></p>
         </td>
@@ -208,19 +209,19 @@
             <p class="p1"><span style="font-weight:bolder ">责任部门</span></p>
         </td>
          <td class="td2">
-             <p class="p1"><span style="">${(head.dutyDeptName)!' '}</span></p>
+             <p class="p1"  style="width:90pt"><span>${(head.dutyDeptName)!' '}</span></p>
             </td>
          <td class="td1">
                 <p class="p1"><span style="font-weight:bolder ">校验员</span></p>
             </td>
-         <td class="td2">
-             <p class="p1"><span style="">${(head.checkOperatorName)!' '}</span></p>
+         <td class="td2" style="width:90%">
+             <p class="p1" style="width:auto" ><span style="">${(head.checkOperatorName)!' '}</span></p>
             </td>
         </tr>
     </table>
     <table >
 
-    <tr>
+    <tr style="height: 60pt;">
         <td class="td1">
             <p class="p1"><span style="font-weight:bolder ">处理结果</span></p>
         </td>
@@ -266,25 +267,25 @@
     <table>
        <tr>
          <td class="td1">
-            <p class="p1"><span style="font-weight:bolder ">工号/客户编码</span></p>
+            <p class="p1"><span style="font-weight:bolder;font-size:10pt">工号/客户编码</span></p>
         </td>
            <td class="td1">
-              <p class="p1"><span style="font-weight:bolder ">姓名/客户</span></p>
+              <p class="p1"><span style="font-weight:bolder;font-size:10pt ">姓名/客户</span></p>
         </td>
            <td class="td1">
-               <p class="p1"><span style="font-weight:bolder">部门/客户名称</span></p>
+               <p class="p1"><span style="font-weight:bolder;font-size:10pt">部门/客户名称</span></p>
         </td>
            <td class="td1">
-            <p style="margin:5pt; orphans:0; widows:0"><span style="font-weight:bolder">定责比例</span></p>
+            <p style="margin:5pt; orphans:0; widows:0"><span style="font-weight:bolder;font-size:10pt">定责比例</span></p>
         </td>
            <td class="td1">
-              <p class="p1"><span style="font-weight:bolder">个人责任比例</span></p>
+              <p class="p1"><span style="font-weight:bolder;font-size:10pt">个人责任比例</span></p>
         </td>
            <td class="td1">
-              <p class="p1"><span style="font-weight:bolder">责任金额</span></p>
+              <p class="p1"><span style="font-weight:bolder;font-size:10pt">责任金额</span></p>
         </td>
           <td class="td1" style="width:20%">
-               <p class="p1"><span style="font-weight:bolder">备注</span></p>
+               <p class="p1"><span style="font-weight:bolder;font-size:10pt">备注</span></p>
         </td>
        </tr>
         <#if (dutyList)??  && ((dutyList)?size > 0)>
@@ -292,36 +293,35 @@
                 <tr>
                     <td class="td1">
                     <p class="p1">
-                            <span>${(list.personNo)!''}</span>
+                            <span class="autoLine">${(list.personNo)!''}</span>
                         </p>
                     </td>
                     <td class="td1">
                         <p class="p1">
-                            <span >${(list.personName)!''}</span>
+                            <span class="autoLine">${(list.personName)!''}</span>
                         </p>
                     </td>
                     <td class="td2">
                         <p class="p1">
-                            <span style="">${(list.deptName)!''}</span>
+                            <span class="autoLine">${(list.deptName)!''}</span>
                         </p>
                     </td>
                     <td class="td2">
                         <p class="p1">
-                            <span style="">${(list.dutyRate)!''}</span>
+                            <span class="autoLine">${(list.dutyRate)!''}</span>
                         </p>
                     </td>
                     <td class="td2">
-                        <p class="p1"><span  style=" ">${(list.personDutyRate)!''}</span>
+                        <p class="p1"><span class="autoLine">${(list.personDutyRate)!''}</span>
                         </p>
                     </td>
                     <td class="td2">
                         <p class="p1">
-                            <span  style=" ">${(list.dutyMoney)!''}</span>
+                            <span class="autoLine">${(list.dutyMoney)!''}</span>
                         </p>
                     </td>
                     <td class="td2">
-                        <p class="p1"><span
-                                    style=" ">${(list.remark)!''}</span>
+                        <p class="p1"><span class="autoLine">${(list.remark)!''}</span>
                         </p>
                     </td>
                   </tr>
@@ -350,7 +350,7 @@
         </td>
         </tr>
     </table>
-    <p style="margin:0pt; orphans:0; text-align:left;margin-top: 1pt; widows:0">
+    <p style="margin:0pt; orphans:0; text-align:left;margin-top: 10pt; widows:0">
         <span class="fs" style="font-weight:bolder ">注：内部、外部异常均须填写此表单。</span>
         <span class="fs" style="font-weight:bolder ">本人已清楚公司的异常责任处理规定。</span>
     </p>

topsun/src/main/java/com/huigou/topsun/sap/exceptionReport/controller/ExceptionReportController.java

@@ -113,7 +113,7 @@ public class ExceptionReportController extends CommonController {
         String id = sdo.getBizId();
         ExceptionReport exceptionReport = exceptionReportApplication.findById(id);
 
-        if ("purchase".equals(exceptionReport.getBillType())||"outgoing".equals(exceptionReport.getBillType())) {
+        if ("produce".equals(exceptionReport.getBillType())||"outgoing".equals(exceptionReport.getBillType())) {
             exceptionReport.setCustomerNoPur(exceptionReport.getCustomerOrderNo());
             exceptionReport.setCustomerNamePur(exceptionReport.getCustomerName());
             exceptionReport.setCustomerOrderNoPur(exceptionReport.getCustomerOrderNo());

topsun/src/main/java/com/huigou/topsun/sap/exceptionReport/domain/ExceptionReport.java

@@ -205,6 +205,10 @@ public class ExceptionReport extends FlowBillAbstractEntity {
     @Column(name = "product_type")
     private String productType;
 
+
+    @Column(name = "source_bill_code")
+    private String sourceBillCode;
+
      @Override
     protected String getCodeRuleId() {
         return "exceptionReport";

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"));   BSTNK
-                 newMap.put("VBELN", map.get("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);