客户延迟付款自选名称调整；其他物品领料不验证数量

topsun-xt/src/main/webapp/biz/topsun/sap/customerDelayPay/customerDelayPayDetail.js

@@ -121,7 +121,7 @@ function getGridColumns(){
         display: "名称", name: "name", width: 200, minWidth: 60, type: "string", align: "left",
     },)
     columns.push({
-        display: "抬头文本/增值税发票号", name: "bktxt", width: 200, minWidth: 60, type: "string", align: "left",
+        display: "抬头文本", name: "bktxt", width: 200, minWidth: 60, type: "string", align: "left",
     },)
     columns.push({
         display: "付款参考 /请款单号", name: "kidno", width: 140, minWidth: 60, type: "string", align: "left",

topsun-xt/src/main/webapp/biz/topsun/sap/customerDelayPay/customerDelayPayDetail.jsp

@@ -27,7 +27,7 @@
             <x:inputC name="bukrsName" required="true" label="公司名称" labelCol="2" fieldCol="2" wrapper="select"/>
             <x:hidden name="customer"/>
             <x:inputC name="name" required="true" label="客户名称" labelCol="2" fieldCol="2" wrapper="select"/>
-            <x:checkboxListC name="xblock" required="false" label="仅显示扣单应收项次" labelCol="2" fieldCol="2" dictionary="xblock"/>
+            <x:checkboxListC name="xblock" required="false" label="仅显示逾期项次" labelCol="2" fieldCol="2" dictionary="xblock"/>
         </div>
         <div class="hg-form-row">
             <x:inputC name="payDate" required="true" label="客户承诺付款时间" labelCol="2" fieldCol="2" wrapper="date"/>

topsun-xt/src/main/webapp/biz/topsun/sap/customerDelayPay/customerDelayPayList.js

@@ -20,7 +20,7 @@ function loadGrid() {
             {display: "申请部门", name: "deptName", width: 120, minWidth: 60, type: "string", align: "left"},
             {display: "公司代码", name: "bukrsName", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "客户编码描述", name: "kunnrName", width: 200, minWidth: 60, type: "string", align: "left"},
-            {display: "扣单应收项次", name: "xblock", width: 200, minWidth: 60, type: "string", align: "left"},
+            {display: "仅显示逾期项次", name: "xblock", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "收款方式", name: "paymentMethodTextView", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "客户承诺付款时间", name: "payDate", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "状态", name: "statusTextView", width: 200, minWidth: 60, type: "string", align: "left"},

topsun-xt/src/main/webapp/biz/topsun/sap/transfers/sapStockTransfersDetail.jsp

@@ -41,6 +41,7 @@
 
             <x:hidden name="werks"/>
             <x:inputC name="werksName" required="true" label="收货工厂" labelCol="2" fieldCol="2" wrapper="select"/>
+            <x:inputC name="message" required="false" label="凭证编号" labelCol="2" fieldCol="2" readonly="true"/>
 
         </div>
     </div>

topsun/src/main/java/com/huigou/topsun/sap/componentSupply/application/impl/ComponentSupplyApplicationImpl.java

@@ -67,18 +67,6 @@ public class ComponentSupplyApplicationImpl extends FlowBroker implements Compon
     public Map<String, Object> getComponentSupplyList(ComponentSupplyQueryRequest queryRequest) {
         QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "componentSupply");
         QueryModel queryModel = this.sqlExecutorDao.getQueryModel(queryDescriptor, queryRequest);
-        if (queryRequest.getStatus() != null) {
-            queryModel.addCriteria(" and t.status =:status");
-            queryModel.putParam("status", queryRequest.getStatus());
-        }
-        if (queryRequest.getBillCode() != null) {
-            queryModel.addCriteria(" and t.bill_code =:billCode");
-            queryModel.putParam("billCode", queryRequest.getBillCode());
-        }
-        if (queryRequest.getReason() != null) {
-            queryModel.addCriteria(" and t.reason like:reason");
-            queryModel.putLikeParam("reason", queryRequest.getReason());
-        }
         queryModel.putDictionary("status", DictUtil.getDictionary("bizBillStatus"));
         queryModel.addCriteria(" order by bill_code desc ");
         Map<String, Object> map = this.sqlExecutorDao.executeSlicedQuery(queryModel);

topsun/src/main/java/com/huigou/topsun/sap/dull/application/impl/SapDullApplicationImpl.java

@@ -51,22 +51,6 @@ public class SapDullApplicationImpl extends FlowBroker implements SapDullApplica
     public Map<String, Object> getDullList(SapDullQueryRequest queryRequest) {
         QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "sapDull");
         QueryModel queryModel = this.sqlExecutorDao.getQueryModel(queryDescriptor, queryRequest);
-        if (queryRequest.getStatus() != null) {
-            queryModel.addCriteria(" and t.status =:status");
-            queryModel.putParam("status", queryRequest.getStatus());
-        }
-        if (queryRequest.getBillCode() != null) {
-            queryModel.addCriteria(" and t.bill_code =:billCode");
-            queryModel.putParam("billCode", queryRequest.getBillCode());
-        }
-        if (queryRequest.getWerks() != null) {
-            queryModel.addCriteria(" and t.werks =:werk");
-            queryModel.putParam("werk", queryRequest.getWerks());
-        }
-        if (queryRequest.getMatnrName() != null) {
-            queryModel.addCriteria(" and t.matnr_name like:matnr");
-            queryModel.putLikeParam("matnr", queryRequest.getMatnrName());
-        }
         queryModel.putDictionary("status", DictUtil.getDictionary("bizBillStatus"));
         queryModel.putDictionary("isFinished", DictUtil.getDictionary("yesorno"));
         queryModel.addCriteria(" order by bill_code desc ");

topsun/src/main/java/com/huigou/topsun/sap/nonProducePick/application/impl/NonProducePickApplicationImpl.java

@@ -144,9 +144,9 @@ public class NonProducePickApplicationImpl extends FlowBroker implements NonProd
             nonProducePick = (NonProducePick) commonDomainService.loadAndFillinProperties(nonProducePick);
         }
         //还未创建预留单之前都需要校验数量
-        if (StringUtil.isBlank(nonProducePick.getMessage())){
-            this.checkNonProducePickNum(nonProducePickItems, nonProducePick.getWerks());
-        }
+//        if (StringUtil.isBlank(nonProducePick.getMessage())){
+//            this.checkNonProducePickNum(nonProducePickItems, nonProducePick.getWerks());
+//        }
         nonProducePick = nonProducePickRepository.save(nonProducePick);
         nonProducePickItemApplication.saveNonProducePickItems(nonProducePick.getId(),nonProducePickItems);
         return nonProducePick.getId();

topsun/src/main/java/com/huigou/topsun/sap/productScrapApply/domain/query/ProductScrapApplyQueryRequest.java

@@ -11,6 +11,7 @@ import lombok.Data;
  */
 @Data
 public class ProductScrapApplyQueryRequest extends QueryAbstractRequest {
+    private String billCode;
 
     private String productScrapApplyId;
     /**

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

@@ -2,7 +2,7 @@
 <query-mappings>
     <query name="componentSupply" label="组件补充发料" table="sap_component_supply">
         <sql-query>
-            select t.* from sap_component_supply t
+            select t.* from sap_component_supply t where 1=1
         </sql-query>
         <condition column="bill_code" name="billCode" type="java.lang.String" symbol="like" alias="t"/>
     </query>