等级数量4/等级数量5...

等级数量4/等级数量5 填写了内容提交审批未带出值;临时工序外协申请单的需求时间选择后没有反应。;筛选增加创建日期、变更序号、品牌、申请人;打印预览三个大领导的签名（工程经理、开发经理、总经理）不见了，打印预览界面需要显示出来

等级数量4/等级数量5...
等级数量4/等级数量5 填写了内容提交审批未带出值;临时工序外协申请单的需求时间选择后没有反应。;筛选增加创建日期、变更序号、品牌、申请人;打印预览三个大领导的签名（工程经理、开发经理、总经理）不见了，打印预览界面需要显示出来
b370f4e6 · 1650842865 · d6bd5006 · b370f4e6 · b370f4e6 · b370f4e6
Commit b370f4e6 authored Apr 25, 2025 by 1650842865
11 changed files
--- a/topsun-xt/src/main/webapp/biz/topsun/ep/change/epChangeFormList.jsp
+++ b/topsun-xt/src/main/webapp/biz/topsun/ep/change/epChangeFormList.jsp
@@ -3,7 +3,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <html>
 <head>
-    <x:base include="layout,dialog,grid,tree,combox,commonTree"/>
+    <x:base include="layout,dialog,grid,tree,combox,commonTree,date"/>
    <x:script src='/biz/topsun/ep/change/epChangeFormList.js'/>
 </head>
 <body>
@@ -14,7 +14,16 @@
        <div position="center" title="宝绅内部变更申请/通知单列表">
            <x:title title="common.button.search" hideTable="queryMainForm" isHide="true"/>
            <form class="hg-form ui-hide" method="post" action="" id="queryMainForm">
-                <x:inputC name="billCode" required="false" label="申请单号" labelCol="1"/>
+                <div class="hg-form-row">
+                    <x:inputC name="billCode" required="false" label="申请单号" labelCol="1"/>
+                    <x:inputC name="changeNo" required="false" label="变更序号" labelCol="1"/>
+                    <x:inputC name="brandName" required="false" label="品牌名称" labelCol="1"/>
+                    <x:inputC name="personMemberName" required="false" label="申请人" labelCol="1"/>
+                </div>
+                <div class="hg-form-row">
+                    <x:inputC name="fillinBeginDate" required="false" wrapper="date" label="创建日期起" labelCol="1"/>
+                    <x:inputC name="fillinEndDate" required="false" wrapper="date" label="创建日期止" labelCol="1"/>
+                </div>
                <x:searchButtons/>
            </form>
            <div class="blank_div clearfix"></div>

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyList.jsp
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyList.jsp
@@ -27,8 +27,8 @@
                <x:inputC name="maktx" required="false" label="汉语品名" labelCol="1"/>
                <%--<x:inputC name="maktx" required="false" label="汉语品名" labelCol="1"/>--%>
                <x:selectC name="maintenanceType" label="维护类型" labelCol="1" fieldCol="2" dictionary="maintainType"/>
-                <x:inputC name="startDate" label="开始日期" wrapper="datetime" labelCol="1" />
+                <x:inputC name="startDate" label="开始日期" wrapper="date" labelCol="1" />
-                <x:inputC name="endDate" label="结束日期" wrapper="datetime" labelCol="1" />
+                <x:inputC name="endDate" label="结束日期" wrapper="date" labelCol="1" />
                <div class="hg-form-row">
                    <x:checkboxListC name="status" label="common.field.status" list="statusKindsList" labelCol="1" fieldCol="3"/>
                </div>

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/processOutsource/processOutsourceDetail.jsp
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/processOutsource/processOutsourceDetail.jsp
@@ -3,7 +3,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <html>
 <head>
-    <x:base include="layout,dialog,grid,tree,combox,commonTree,date,attachment"/>
+    <x:base include="layout,dialog,grid,tree,combox,commonTree,attachment"/>
    <x:script src='/biz/topsun/sap/processOutsource/processOutsourceDetail.js'/>
 </head>
 <body>

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/processOutsource/showAddAufnrDetail.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/processOutsource/showAddAufnrDetail.js
@@ -73,10 +73,6 @@ function initGrid() {
    UICtrl.setSearchAreaToggle(gridManager);
 }
-function reloadGrid() {
-    gridManager.loadData();
-}
 function query(obj) {
    var param = $(obj).formToJSON();
    UICtrl.gridSearch(gridManager, param);
@@ -84,6 +80,5 @@ function query(obj) {
 function resetForm(obj) {
    $(obj).formClean();
-    reloadGrid();
 }
--- a/topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/addPurchaseInfoRecordDetail.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/addPurchaseInfoRecordDetail.js
@@ -3,7 +3,7 @@ var  canEdit=true;
 $(document).ready(function () {
    initialize();
-    bindEvent();
+    bindDetailEvent();
 });
 function initialize(){
    UICtrl.layout("#layout", {leftWidth: 3});
@@ -75,7 +75,7 @@ function disableForm(formId,isDisabled) {
    });
 }
-function bindEvent(){
+function bindDetailEvent(){
    $('#werksName').searchbox({
        type: "system", name: "dictionary",
        getParam: function (item) {
@@ -261,6 +261,19 @@ function bindEvent(){
            $('#regioName').val(data.BEZEI);
        }
    });
+    $('#kbetr').on('input', function() {
+        let inputValue = $(this).val();
+        if (isNaN(Number(inputValue))) {
+            Public.errorTip("等级金额1必须输入数字!");
+        }else {
+            if (Public.isNotBlank(inputValue)) {
+                UICtrl.disable($('#netpr'))
+                $('#netpr').val(inputValue);
+            }else {
+                UICtrl.enable($('#netpr'))
+            }
+        }
+    });
 }
 function reloadGrid() {

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/addPurchaseInfoRecordDetail.jsp
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/addPurchaseInfoRecordDetail.jsp
@@ -93,7 +93,7 @@
            <x:inputC name="kstbm5" label="等级数量5" labelCol="1" fieldCol="1" required="false" mask="9999999.99"/>
                </div>
            <div class="hg-form-row">
-                <x:inputC name="kbetr" label="等级金额1" labelCol="1" fieldCol="1" required="false" mask="9999999.99"/>
+                <x:inputC name="kbetr" label="等级金额1" labelCol="1" fieldCol="1" required="false"/>
                <x:inputC name="kbetr2" label="等级金额2" labelCol="1" fieldCol="1" required="false" mask="9999999.99"/>
                <x:inputC name="kbetr3" label="等级金额3" labelCol="1" fieldCol="1" required="false" mask="9999999.99"/>
                <x:inputC name="kbetr4" label="等级金额4" labelCol="1" fieldCol="1" required="false" mask="9999999.99"/>

--- a/topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/purchaseInfoRecordDetail.js
+++ b/topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/purchaseInfoRecordDetail.js
@@ -677,6 +677,10 @@ function  doSaveDefine() {
            kbetr2: $("#kbetr2").val(),
            kstbm3: $("#kstbm3").val(),
            kbetr3: $("#kbetr3").val(),
+            kstbm4: $("#kstbm4").val(),
+            kbetr4: $("#kbetr4").val(),
+            kstbm5: $("#kstbm5").val(),
+            kbetr5: $("#kbetr5").val(),
            remark: $("#remark").val(),
        });

--- a/topsun/src/main/java/com/huigou/topsun/ep/change/domain/query/EpChangeFormQueryRequest.java
+++ b/topsun/src/main/java/com/huigou/topsun/ep/change/domain/query/EpChangeFormQueryRequest.java
@@ -3,15 +3,103 @@ package com.huigou.topsun.ep.change.domain.query;
 import com.huigou.data.domain.query.QueryAbstractRequest;
 import lombok.Data;
+import java.util.Calendar;
+import java.util.Date;
 /**
 * @Auther: xin.lu
 * @Date: 2024/06/19/10:14
 * @Description:
 */
-@Data
 public class EpChangeFormQueryRequest extends QueryAbstractRequest {
    private String billCode;
    private String epChangeFormId;
    private String id;
    private String oldId;
+    private String changeNo;
+    private String brandName;
+    private String personMemberName;
+    protected Date fillinBeginDate;
+    protected Date fillinEndDate;
+    public String getBillCode() {
+        return billCode;
+    }
+    public void setBillCode(String billCode) {
+        this.billCode = billCode;
+    }
+    public String getEpChangeFormId() {
+        return epChangeFormId;
+    }
+    public void setEpChangeFormId(String epChangeFormId) {
+        this.epChangeFormId = epChangeFormId;
+    }
+    public String getId() {
+        return id;
+    }
+    public void setId(String id) {
+        this.id = id;
+    }
+    public String getOldId() {
+        return oldId;
+    }
+    public void setOldId(String oldId) {
+        this.oldId = oldId;
+    }
+    public String getChangeNo() {
+        return changeNo;
+    }
+    public void setChangeNo(String changeNo) {
+        this.changeNo = changeNo;
+    }
+    public String getBrandName() {
+        return brandName;
+    }
+    public void setBrandName(String brandName) {
+        this.brandName = brandName;
+    }
+    public String getPersonMemberName() {
+        return personMemberName;
+    }
+    public void setPersonMemberName(String personMemberName) {
+        this.personMemberName = personMemberName;
+    }
+    public Date getFillinBeginDate() {
+        return fillinBeginDate;
+    }
+    public void setFillinBeginDate(Date fillinBeginDate) {
+        this.fillinBeginDate = fillinBeginDate;
+    }
+    public Date getFillinEndDate() {
+        return fillinEndDate;
+    }
+    public void setFillinEndDate(Date fillinEndDate) {
+        if (fillinEndDate != null) {
+            // 使用Calendar类给日期加一天
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(fillinEndDate);
+            calendar.add(Calendar.DATE, 1); // 给日期加上一天
+            // 获取新的Date对象
+            fillinEndDate = calendar.getTime();
+        }
+        this.fillinEndDate = fillinEndDate;
+    }
 }
--- a/topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/query/NonProdApplyBaseInfoQueryRequest.java
+++ b/topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/query/NonProdApplyBaseInfoQueryRequest.java
@@ -3,9 +3,9 @@ package com.huigou.topsun.sap.nonProdApply.domain.query;
 import com.huigou.data.domain.query.FlowBillSuperQueryRequest;
 import lombok.Data;
+import java.util.Calendar;
 import java.util.Date;
-@Data
 public class NonProdApplyBaseInfoQueryRequest extends FlowBillSuperQueryRequest {
    /**
@@ -98,9 +98,195 @@ public class NonProdApplyBaseInfoQueryRequest extends FlowBillSuperQueryRequest
    private String  billCode;
-    private String  startDate;
+    private Date  startDate;
+    private Date  endDate;
-    private String  endDate;
    private String  werks;
+    public String getMaintenanceType() {
+        return maintenanceType;
+    }
+    public void setMaintenanceType(String maintenanceType) {
+        this.maintenanceType = maintenanceType;
+    }
+    public String getApprovalStatus() {
+        return approvalStatus;
+    }
+    public void setApprovalStatus(String approvalStatus) {
+        this.approvalStatus = approvalStatus;
+    }
+    public String getApprover() {
+        return approver;
+    }
+    public void setApprover(String approver) {
+        this.approver = approver;
+    }
+    public Date getApprovalDate() {
+        return approvalDate;
+    }
+    public void setApprovalDate(Date approvalDate) {
+        this.approvalDate = approvalDate;
+    }
+    public String getGenericName() {
+        return genericName;
+    }
+    public void setGenericName(String genericName) {
+        this.genericName = genericName;
+    }
+    public String getApplicableStandard() {
+        return applicableStandard;
+    }
+    public void setApplicableStandard(String applicableStandard) {
+        this.applicableStandard = applicableStandard;
+    }
+    public String getBaseUnit() {
+        return baseUnit;
+    }
+    public void setBaseUnit(String baseUnit) {
+        this.baseUnit = baseUnit;
+    }
+    public String getSpecifications() {
+        return specifications;
+    }
+    public void setSpecifications(String specifications) {
+        this.specifications = specifications;
+    }
+    public String getMaterial() {
+        return material;
+    }
+    public void setMaterial(String material) {
+        this.material = material;
+    }
+    public String getDesign() {
+        return design;
+    }
+    public void setDesign(String design) {
+        this.design = design;
+    }
+    public String getSize() {
+        return size;
+    }
+    public void setSize(String size) {
+        this.size = size;
+    }
+    public String getBrand() {
+        return brand;
+    }
+    public void setBrand(String brand) {
+        this.brand = brand;
+    }
+    public String getMaterialUsage() {
+        return materialUsage;
+    }
+    public void setMaterialUsage(String materialUsage) {
+        this.materialUsage = materialUsage;
+    }
+    public String getItemAttributes() {
+        return itemAttributes;
+    }
+    public void setItemAttributes(String itemAttributes) {
+        this.itemAttributes = itemAttributes;
+    }
+    public String getBusinessUsage() {
+        return businessUsage;
+    }
+    public void setBusinessUsage(String businessUsage) {
+        this.businessUsage = businessUsage;
+    }
+    public String getTextDescription() {
+        return textDescription;
+    }
+    public void setTextDescription(String textDescription) {
+        this.textDescription = textDescription;
+    }
+    public String getMatnr() {
+        return matnr;
+    }
+    public void setMatnr(String matnr) {
+        this.matnr = matnr;
+    }
+    public String getMaktx() {
+        return maktx;
+    }
+    public void setMaktx(String maktx) {
+        this.maktx = maktx;
+    }
+    @Override
+    public String getBillCode() {
+        return billCode;
+    }
+    @Override
+    public void setBillCode(String billCode) {
+        this.billCode = billCode;
+    }
+    public Date getStartDate() {
+        return startDate;
+    }
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+    public Date getEndDate() {
+        return endDate;
+    }
+    public void setEndDate(Date endDate) {
+        if (endDate != null) {
+            // 使用Calendar类给日期加一天
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(endDate);
+            calendar.add(Calendar.DATE, 1); // 给日期加上一天
+            // 获取新的Date对象
+            endDate = calendar.getTime();
+        }
+        this.endDate = endDate;
+    }
+    public String getWerks() {
+        return werks;
+    }
+    public void setWerks(String werks) {
+        this.werks = werks;
+    }
 }
\ No newline at end of file
--- a/topsun/src/main/java/com/huigou/topsun/sap/nonProducePick/controller/NonProducePickController.java
+++ b/topsun/src/main/java/com/huigou/topsun/sap/nonProducePick/controller/NonProducePickController.java
@@ -29,10 +29,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
 import javax.annotation.Resource;
 import java.io.File;
@@ -50,6 +47,8 @@ import java.util.stream.Collectors;
 */
 @Controller
 @ControllerMapping("/nonProducePick")
+//@CrossOrigin(origins = "*")
 public class NonProducePickController extends CommonController {
    private final static Logger LOG = LoggerFactory.getLogger(NonProducePickController.class);
    @Override
@@ -145,8 +144,10 @@ public class NonProducePickController extends CommonController {
        return success();
    }
+    //// 允许多个域名
+    //@CrossOrigin(origins = {"http://front1.com", "http://front2.com"})
    @SkipAuth
-    @RequestMapping( value = "/getNonProducePick",consumes = "application/json; charset=UTF-8", produces = "application/json; charset=UTF-8")
+    @RequestMapping( value = "/getNonProducePick",method = RequestMethod.POST)
    @ResponseBody
    public Map<String, Object> getNonProducePick(@RequestBody Map<String, List<String>> requestBody){
        LOG.info("PDA退料查询数据=={}", JSONUtil.toString(requestBody));
@@ -167,7 +168,7 @@ public class NonProducePickController extends CommonController {
    }
    @SkipAuth
-    @RequestMapping( value = "/backNonProducePick",consumes = "application/json; charset=UTF-8", produces = "application/json; charset=UTF-8")
+    @RequestMapping( value = "/backNonProducePick",method = RequestMethod.POST)
    @ResponseBody
    public Map<String, Object> backNonProducePick(@RequestBody PDABackPickVo requestBody){
        LOG.info("PDA退料返回数据=={}", JSONUtil.toString(requestBody));

--- a/topsun/src/main/resources/config/topsun/ep/change/epChangeForm.xml
+++ b/topsun/src/main/resources/config/topsun/ep/change/epChangeForm.xml
@@ -6,6 +6,11 @@
        </sql-query>
        <condition column="bill_code" name="billCode" type="java.lang.String" symbol="like" alias="t"/>
        <condition column="id" name="id" type="java.lang.String" symbol="=" alias="t"/>
+        <condition column="change_no" name="changeNo" type="java.lang.String" symbol="like" alias="t"/>
+        <condition column="brand_name" name="brandName" type="java.lang.String" symbol="like" alias="t"/>
+        <condition column="person_member_name" name="personMemberName" type="java.lang.String" symbol="like" alias="t"/>
+        <condition column="fillin_date" name="fillinBeginDate" type="java.util.Date" symbol="&gt;=" alias="t"/>
+        <condition column="fillin_date" name="fillinEndDate" type="java.util.Date" symbol="&lt;=" alias="t"/>
    </query>
    <query name="epChangeFormStockItem">
@@ -52,19 +57,13 @@
    <query name="queryApprovalPersons">
        <sql-query>
-            <!--SELECT
-             CONCAT( t.SUB_PROC_UNIT_NAME, "：", t.HANDLER_NAME ) AS approval_name,
-             CONCAT("DATA 日期：",t.HANDLED_DATE) as handled_date,
-             CONCAT("COMMENTS 评论：",t.OPINION) as opinion
-             FROM
-             wf_procunithandler t WHERE t.BIZ_ID = ? ORDER BY t.GROUP_ID ASC-->
            SELECT
            CONCAT( t.SUB_PROC_UNIT_NAME, "：", t.HANDLER_NAME ) AS approval_name,
            t.HANDLER_NAME,
            DATE_FORMAT(t.HANDLED_DATE, '%Y-%m-%d') as HANDLED_DATE,
            t.OPINION
            FROM
-            wf_procunithandler t WHERE t.BIZ_ID = ? and t.RESULT = 1 and t.SUB_PROC_UNIT_ID != 'executorId' ORDER BY t.GROUP_ID,t.HANDLED_DATE ASC
+            wf_procunithandler t WHERE t.BIZ_ID = ? and t.RESULT = 1 and t.SUB_PROC_UNIT_ID IS NULL ORDER BY t.GROUP_ID,t.HANDLED_DATE ASC
        </sql-query>
    </query>