无订单库存入库调整

topsun-xt/src/main/webapp/biz/topsun/sap/nonOrderStorage/nonOrderStorageDetail.js

@@ -67,6 +67,7 @@ function bindEvent() {
             }
         },
         onChange: function (value, data) {
+            $('#productCode').val(data.MATNR);
             $('#productName').val(data.MAKTX);
             $('#unit').val(data.MEINS);
             $('#unitName').val(data.MSEHL);
@@ -74,6 +75,19 @@ function bindEvent() {
             $('#storeName').val(data.LGOBE);
         }
     });
+
+    $('#supplierName').searchbox({
+        type: "system", name: "selectSuppliersDatas",
+        getParam: function (item) {
+            return {
+               // filterValue: $('#werks').val()
+            }
+        },
+        onChange: function (value, data) {
+            $('#supplier').val(data.partner);
+            $('#supplierName').val(data.nameOrg1);
+        }
+    });
 }
 
 function amountController(value){

topsun-xt/src/main/webapp/biz/topsun/sap/nonOrderStorage/nonOrderStorageDetail.jsp

@@ -41,7 +41,9 @@
         <div class="hg-form-row">
             <x:selectC name="isCharge" required="true" label="是否收费" labelCol="1" dictionary="yesorno" fieldCol="2"/>
             <x:inputC name="storeName" required="false" label="库存地点" labelCol="1" wrapper="select" fieldCol="2"/>
-            <x:inputC name="supplier" required="true" label="供应商" labelCol="1" fieldCol="2"/>
+            <!--x:inputC name="supplier" required="true" label="供应商" labelCol="1" fieldCol="2"/-->
+            <x:hidden name="supplier"/>
+            <x:inputC name="supplierName" required="true" label="供应商名称" labelCol="1" fieldCol="2" wrapper="select"/>
             <x:inputC name="amount" required="false" label="总价值" labelCol="1" fieldCol="2" mask="positiveMoney"/>
         </div>
         <div class="hg-form-row">

topsun-xt/src/main/webapp/biz/topsun/sap/nonOrderStorage/nonOrderStorageList.js

@@ -8,6 +8,19 @@ $(document).ready(function () {
 
 function initializateUI() {
     UICtrl.layout("#layout", {leftWidth: 3});
+    $('#supplierName').searchbox({
+        type: "system", name: "selectSuppliersDatas",
+        getParam: function (item) {
+            return {
+                ///  fieldName: "sapMaterialSelect",
+                filterValue: $('#werks').val()
+            }
+        },
+        onChange: function (value, data) {
+            $('#supplier').val(data.partner);
+            $('#supplierName').val(data.nameOrg1);
+        }
+    });
 }
 
 function loadCostCenterListGrid() {
@@ -20,15 +33,16 @@ function loadCostCenterListGrid() {
     gridManager = UICtrl.grid("#maingrid", {
         columns: [
             {display: "品名", name: "productName", width: 140, minWidth: 60, type: "string", align: "left"},
-            {display: "数量", name: "number", width: 140, minWidth: 60, type: "string", align: "left"},
-            {display: "单位", name: "unitName", width: 140, minWidth: 60, type: "string", align: "left"},
-            {display: "是否收费", name: "isChargeTextView", width: 120, minWidth: 60, type: "string", align: "left"},
+            {display: "数量", name: "number", width: 100, minWidth: 60, type: "string", align: "left"},
+            {display: "单位", name: "unitName", width: 100, minWidth: 60, type: "string", align: "left"},
+            {display: "是否收费", name: "isChargeTextView", width: 100, minWidth: 60, type: "string", align: "left"},
             {display: "工厂", name: "werksName", width: 120, minWidth: 60, type: "string", align: "left"},
             {display: "库存地点", name: "storeName", width: 100, minWidth: 60, type: "string", align: "left"},
-            {display: "供应商", name: "supplier", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "供应商", name: "supplierName", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "申请人", name: "personMemberName", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "申请部门", name: "deptName", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "申请日期", name: "fillinDate", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "单据编号", name: "billCode", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "事由", name: "reason", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "状态", name: "statusTextView", width: 60, minWidth: 60, type: "string", align: "center",},
             {display: "消息类型", name: "type", width: 140, minWidth: 60, type: "string", align: "left"},

topsun-xt/src/main/webapp/biz/topsun/sap/nonOrderStorage/nonOrderStorageList.jsp

@@ -14,7 +14,11 @@
         <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"/>
+                <x:inputC name="billCode" required="false" label="单据编号" labelCol="1"/>
+                <x:hidden name="supplier"/>
+                <x:inputC name="productName" required="false" label="品名" labelCol="1"/>
+                <x:inputC name="supplierName" required="false" label="供应商名称" labelCol="1" fieldCol="2" wrapper="select"/>
+                <x:selectC name="status" label="状态" labelCol="1" fieldCol="2" dictionary="bizBillStatus"/>
                 <x:searchButtons />
             </form>
             <div class="blank_div clearfix"></div>

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/addPurchaseInfoRecordDetail.js

@@ -24,6 +24,9 @@ function initialize(){
             });
         }
     }
+    if ($('#matnr').val()!=""){ //物料编码不为空 禁用物料组
+        UICtrl.disable($("#matklName"));
+    }
 }
 
 /**

topsun/src/main/java/com/huigou/topsun/controller/ResourceSearchController.java

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.huigou.cache.DictUtil;
 import com.huigou.topsun.sap.sapApplication.application.*;
 import com.huigou.topsun.sap.sapApplication.domain.query.SapDialogQuery;
+import com.huigou.topsun.sap.suppliers.application.SuppliersDataApplication;
 import com.huigou.topsun.util.SAPUtils;
 import com.huigou.uasp.annotation.ControllerMapping;
 import com.huigou.uasp.bmp.common.easysearch.EasySearch;
@@ -47,6 +48,8 @@ public class ResourceSearchController {
     private  DictionaryApplication dictionaryApplication;
     @Autowired
     private SapBankInfoApplication sapBankInfoApplication;
+    @Autowired
+    private SuppliersDataApplication suppliersDataApplication;
 
     @EasySearch(queryName = "knttp")
     public Map<String, Object> knttpSelect(SDO sdo){
@@ -393,4 +396,14 @@ public class ResourceSearchController {
         return sapDictionaryApplication.initEasySearchModel( mapList, param, sdo);
     }
 
+    @EasySearch(queryName = "selectSuppliersDatas")
+    public Map<String, Object> getSuppliersDatas(SDO sdo) throws IOException {
+        String param = sdo.getString("paramValue");
+        String PARTNER = sdo.getString("PARTNER");
+      //  String ZEP_BPTYPE = sdo.getString("ZEP_BPTYPE");
+        List<Map<String, String>> mapList = new ArrayList<>();
+        mapList = suppliersDataApplication.selectSuppliersDatas(PARTNER);
+        return sapDictionaryApplication.initEasySearchModel( mapList, param, sdo);
+    }
+
 }

topsun/src/main/java/com/huigou/topsun/sap/clientMaterials/domain/ClientMaterials.java

@@ -56,6 +56,13 @@ public class ClientMaterials extends FlowBillAbstractEntity {
     @Column(name = "attbiz_id")
     private String attbizId;
 
+
+    @Column(name = "sale_order")
+    private String saleOrder;
+
+    @Column(name = "produce_order")
+    private String produceOrder;
+
     @Override
     protected String getCodeRuleId() {
         return "clientMaterials";

topsun/src/main/java/com/huigou/topsun/sap/nonOrderStorage/application/impl/NonOrderStorageApplicationImpl.java

@@ -14,6 +14,7 @@ import com.huigou.topsun.sap.suppliers.domain.SuppliersInfo;
 import com.huigou.uasp.bmp.common.BizBillStatus;
 import com.huigou.uasp.bpm.FlowBroker;
 import com.huigou.util.ClassHelper;
+import com.huigou.util.StringUtil;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.DelegateTask;
 import org.springframework.beans.BeanUtils;
@@ -121,7 +122,7 @@ public class NonOrderStorageApplicationImpl extends FlowBroker implements NonOrd
     }
 
     @Transactional
-    private void updateStatus(String bizId, BizBillStatus status) {
+    protected void updateStatus(String bizId, BizBillStatus status) {
         Assert.hasText(bizId, CommonDomainConstants.ID_NOT_BLANK);
         this.commonDomainService.updateStatus(NonOrderStorage.class, bizId, status.getId());
     }
@@ -130,6 +131,23 @@ public class NonOrderStorageApplicationImpl extends FlowBroker implements NonOrd
     public Map<String, Object> slicedNonOrderStorageList(NonOrderStorageQueryRequest nonOrderStorageQueryRequest) {
         QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "nonOrderStorage");
         QueryModel queryModel = this.sqlExecutorDao.getQueryModel(queryDescriptor, nonOrderStorageQueryRequest);
+
+        if (StringUtil.isNotBlank(nonOrderStorageQueryRequest.getBillCode())) {
+            queryModel.addCriteria(" and t.bill_code like:billCode");
+            queryModel.putLikeParam("billCode", nonOrderStorageQueryRequest.getBillCode());
+        }
+        if (StringUtil.isNotBlank(nonOrderStorageQueryRequest.getProductName())) {
+            queryModel.addCriteria(" and t.product_name like:productName");
+            queryModel.putLikeParam("productName", nonOrderStorageQueryRequest.getProductName());
+        }
+        if (StringUtil.isNotBlank(nonOrderStorageQueryRequest.getSupplier())) {
+            queryModel.addCriteria(" and t.supplier =:supplier");
+            queryModel.putParam("supplier", nonOrderStorageQueryRequest.getSupplier());
+        }
+        if (nonOrderStorageQueryRequest.getStatus() != null) {
+            queryModel.addCriteria(" and t.status =:status");
+            queryModel.putParam("status", nonOrderStorageQueryRequest.getStatus());
+        }
         queryModel.putDictionary("status", DictUtil.getDictionary("bizBillStatus"));
         queryModel.putDictionary("isCharge", DictUtil.getDictionary("yesorno"));
         Map<String, Object> map = this.sqlExecutorDao.executeSlicedQuery(queryModel);

topsun/src/main/java/com/huigou/topsun/sap/nonOrderStorage/domain/NonOrderStorage.java

@@ -85,6 +85,11 @@ public class NonOrderStorage extends FlowBillAbstractEntity {
     @Column(name = "supplier")
     private String supplier;
 
+    /**
+     * 供应商
+     */
+    @Column(name = "supplier_name")
+    private String supplierName;
     /**
      * 消息类型
      */

topsun/src/main/java/com/huigou/topsun/sap/nonOrderStorage/domain/query/NonOrderStorageQueryRequest.java

@@ -11,4 +11,8 @@ import lombok.Data;
 @Data
 public class NonOrderStorageQueryRequest extends QueryAbstractRequest {
     private String billCode;
+    private String supplier;
+    private String supplierName;
+    private String status;
+    private String productName;
 }

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/SapNonProdApplyDept.java

@@ -110,7 +110,7 @@ public class SapNonProdApplyDept implements Serializable {
 
 
     /**
-     * 规格
+     * 尺寸
      */
     @Column(name = "GROES")
     private String groes;

topsun/src/main/java/com/huigou/topsun/sap/suppliers/application/SuppliersDataApplication.java

@@ -44,4 +44,6 @@ public interface SuppliersDataApplication {
     void deleteSuppliersBuyerByIds( List<String> ids);
 
     void deleteSuppliersBankByIds( List<String> ids);
+
+    List<Map<String, String>> selectSuppliersDatas(String types);
 }

topsun/src/main/java/com/huigou/topsun/sap/suppliers/application/impl/SuppliersDataApplicationImpl.java

@@ -42,6 +42,7 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 
+import java.io.IOException;
 import java.util.*;
 
 @Service("suppliersDataApplication")
@@ -68,7 +69,7 @@ public class SuppliersDataApplicationImpl extends FlowBroker implements Supplier
             model.addCriteria(" and t.bill_code like:billCode");
             model.putLikeParam("billCode", query.getBillCode());
         }
-        if (StringUtil.isNotBlank(query.getBillCode())) {
+        if (StringUtil.isNotBlank(query.getNameOrg1())) {
             model.addCriteria(" and t.name_Org1 like:nameOrg1");
             model.putLikeParam("nameOrg1", query.getNameOrg1());
         }
@@ -540,4 +541,27 @@ public class SuppliersDataApplicationImpl extends FlowBroker implements Supplier
         }
 
     }
+
+    public List<Map<String, String>> selectSuppliersDatas(String types)  {
+        SuppliersDataQueryRequest queryRequest=new SuppliersDataQueryRequest();
+        List<Map<String, String>> list =new ArrayList<>();
+        try {
+            String sql="select  t.partner,t.name_org1 from sap_suppliers_info t where t.partner!='' and t.status=3 ";
+            List<Map<String, Object>> list2=this.sqlExecutorDao.queryToListMap(sql);
+            for (Map map:list2){
+              list.add(map);
+           }
+        //    QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "sap_suppliers_info");
+         //   QueryModel queryModel = this.sqlExecutorDao.getQueryModel(queryDescriptor, queryRequest);
+       //     queryModel.putDictionary("banks", DictUtil.getDictionary("country"));
+       //     queryModel.addCriteria(" and t.status =3");
+            // queryModel.putParam("sId", queryRequest.getSId());
+
+           // Map<String, Object> map = this.sqlExecutorDao.executeSlicedQuery(queryModel);
+            // list = (List<Map<String, String>>) map.get("Rows");
+        }catch (Exception ex){
+            ex.printStackTrace();
+        }
+        return list;
+    }
 }