客户供料通知调整

topsun-xt/src/main/webapp/biz/topsun/sap/clientMaterials/clientMaterialsDetail.js

@@ -2,7 +2,7 @@ var gridManager = null;
 
 $(document).ready(function () {
     initialize();
-   // loadGrid();
+    loadGrid();
     bindEvent();
 });
 function initialize(){
@@ -54,7 +54,7 @@ function loadGrid() {
         deleteHandler: function () {
             var _grid = UICtrl.getGridManager('#maingrid');
             DataUtil.delSelectedRows({
-                action: 'sapPermitItem/deleteclientMaterialsInfoList.ajax',
+                action: 'clientMaterials/deleteClientMaterialsItems.ajax',
                 param: {},
                 gridManager: _grid,
                 idFieldName: 'id',
@@ -109,7 +109,7 @@ function loadGrid() {
             },
             {display: "供给物料名称", name: "supplyMaterialName", width: "200", align: "left", type: "string"},
 
-            { display: "补发数量", name: "quantity", width: 140, minWidth: 60, type: "string", align: "left",
+            { display: "数量", name: "quantity", width: 100, minWidth: 60, type: "string", align: "left",
                 editor: {  type: "text",mask: 'nnnnnn.nn',required: true }
             },
             {
@@ -118,10 +118,10 @@ function loadGrid() {
             }
         ],
         dataAction: "server",
-        url: web_app.name + '/componentSupplyItem/queryComponentSupplyItems.ajax',
+        url: web_app.name + '/clientMaterials/queryClientMaterialsItems.ajax',
         pageSize: 10,
         usePager: true,
-        parms:{componentSupplyId:getId()},
+        parms:{clientMaterialsId:getId()},
         toolbar: toolbarOptions,
         enabledEdit: true,
         width: "100%",

topsun-xt/src/main/webapp/biz/topsun/sap/clientMaterials/clientMaterialsDetail.jsp

@@ -39,7 +39,7 @@
             <x:selectC name="used" label="用途" required="false" labelCol="1" fieldCol="2" dictionary="materialUse"/>
         </div>
         <div class="hg-form-row">
-            <x:textareaC name="remark" id="remark" required="false" rows="3" label="情况说明" labelCol="2" fieldCol="10" />
+            <x:textareaC name="remark" id="remark" required="false" rows="3" label="情况说明" labelCol="1" fieldCol="11" />
         </div>
     </div>
     <div class="blank_div clearfix"></div>
@@ -48,6 +48,7 @@
     <div style="padding-top: 15px;">
         <x:fileList bizCode="clientMaterialsInfo" bizId="attbizId" id="clientMaterialsInfoList" title="上传附件" />
     </div>
+
 </form>
 </body>
 </html>

topsun-xt/src/main/webapp/biz/topsun/sap/nonProducePick/nonProducePickDetail.js

@@ -89,10 +89,10 @@ function loadGrid() {
     gridManager = UICtrl.grid("#maingrid", {
         columns: [
             {
-                display: "序号", name: "rspos", width: 100, minWidth: 60, type: "string", align: "left",
+                display: "序号", name: "rspos", width: 70, minWidth: 60, type: "string", align: "left",
             },
             {
-                display: "物料", name: "matnr", width: 200, minWidth: 60, type: "string", align: "left",
+                display: "物料", name: "matnr", width: 160, minWidth: 60, type: "string", align: "left",
                 editor: {
                     required: true, type: "select",
                     data: {
@@ -114,7 +114,7 @@ function loadGrid() {
                 }
             },
             {
-                display: "物料描述", name: "maktx", width: 300, minWidth: 60, type: "string", align: "left",
+                display: "物料描述", name: "maktx", width: 200, minWidth: 60, type: "string", align: "left",
                 editor: {
                     type: "text"
                 }
@@ -140,23 +140,29 @@ function loadGrid() {
                 }
             },
             {
-                display: "数量", name: "erfmg", width: 140, minWidth: 60, type: "string", align: "left",
+                display: "数量", name: "erfmg", width: 100, minWidth: 60, type: "string", align: "left",
                 editor: {
                     type: "text",mask: '9999999.99',required: true
                 }
             },
             {
-                display: "计量单位", name: "msehl", width: 140, minWidth: 60, type: "string", align: "left",
+                display: "计量单位", name: "msehl", width: 90, minWidth: 60, type: "string", align: "left",
                 // editor: {
                 //     type: "text"
                 // }
             },
             {
-                display: "领料方", name: "wempf", width: 300, minWidth: 60, type: "string", align: "left",
-                editor: {
-                    type: "text"
-                }
+                display: "领料方", name: "wempf", width: 200, minWidth: 60, type: "string", align: "left",
+                editor: {type: "text",maxLength:500 }
             },
+            {
+                display: "用途", name: "used", width: 200, minWidth: 60, type: "string", align: "left",
+                editor: { type: "text",maxLength:500 }
+            },
+            {
+               display: "备注", name: "remark", width: 300, minWidth: 60, type: "string", align: "left",
+                editor: { type: "text",maxLength:1000 }
+            }
         ],
         dataAction: "server",
         url: web_app.name + '/nonProducePickItem/queryNonProducePickItems.ajax',

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

@@ -97,7 +97,7 @@ function loadGrid() {
     gridManager = UICtrl.grid("#maingrid", {
         columns: [
             {
-                display: "行号", name: "ebelp", width: 100, minWidth: 60, type: "String", align: "left"
+                display: "行号", name: "ebelp", width: 80, minWidth: 60, type: "String", align: "left"
             },
             {display: "物料", name: "matnr", width: "160", align: "left", type: "string",
                 editor: {
@@ -120,7 +120,7 @@ function loadGrid() {
                 }
             },
             {display: "物料名称", name: "matnrName", width: "200", align: "left", type: "string"},
-            {display: "数量", name: "menge", width: 120, minWidth: 60, type: "string", align: "left",
+            {display: "数量", name: "menge", width: 100, minWidth: 60, type: "string", align: "left",
                 editor: {  type: "text",mask: 'nnnnnn',required: true }
             },
             { display: "单位", name: "meinsName", width: 120, minWidth: 60, type: "string", align: "left",
@@ -160,6 +160,10 @@ function loadGrid() {
                 }
             },
             {display: "库存地点名称", name: "lgortName", width: "200", align: "left", type: "string"},
+            {
+                display: "备注", name: "remark", width: 300, minWidth: 60, type: "string", align: "left",
+                editor: {   type: "text",maxLength:1000 }
+            }
         ],
         dataAction: "server",
         url: web_app.name + '/sapStockTransfersItem/querySapStockTransfersItems.ajax',

topsun/src/main/java/com/huigou/topsun/sap/clientMaterials/application/ClientMaterialsItemApplication.java

+package com.huigou.topsun.sap.clientMaterials.application;
+
+
+import com.huigou.topsun.sap.clientMaterials.domain.ClientMaterialsItem;
+import com.huigou.topsun.sap.clientMaterials.domain.query.ClientMaterialsQueryRequest;
+import com.huigou.topsun.sap.componentSupply.domain.ComponentSupplyItem;
+import com.huigou.topsun.sap.componentSupply.domain.query.ComponentSupplyQueryRequest;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Auther: LXH
+ * @Date: 2024/07/25/10:35
+ * @Description:
+ */
+public interface ClientMaterialsItemApplication {
+    public static final String QUERY_XML_FILE_PATH = "config/topsun/sap/clientMaterials/clientMaterialsItem.xml";
+
+    void saveClientMaterialsItems(String clientMaterialsId, List<ClientMaterialsItem> items);
+
+    Map<String,Object> queryClientMaterialsItems(ClientMaterialsQueryRequest queryRequest);
+
+    void deleteByIds(List<String> ids);
+
+    List<ClientMaterialsItem> findByClientMaterialsId(String clientMaterialsId);
+}

topsun/src/main/java/com/huigou/topsun/sap/clientMaterials/application/impl/ClientMaterialsApplicationImpl.java

@@ -10,13 +10,17 @@ import com.huigou.data.query.model.QueryModel;
 import com.huigou.topsun.sap.clientMaterials.application.ClientMaterialsApplication;
 import com.huigou.topsun.sap.clientMaterials.application.ClientMaterialsApplication;
 
+import com.huigou.topsun.sap.clientMaterials.application.ClientMaterialsItemApplication;
 import com.huigou.topsun.sap.clientMaterials.domain.ClientMaterials;
 
+import com.huigou.topsun.sap.clientMaterials.domain.ClientMaterialsItem;
 import com.huigou.topsun.sap.clientMaterials.domain.query.ClientMaterialsQueryRequest;
 
+import com.huigou.topsun.sap.clientMaterials.repository.ClientMaterialsItemRepository;
 import com.huigou.topsun.sap.clientMaterials.repository.ClientMaterialsRepository;
 
 import com.huigou.topsun.sap.clientMaterials.vo.ClientMaterialsVo;
+import com.huigou.topsun.sap.componentSupply.domain.ComponentSupplyItem;
 import com.huigou.uasp.bmp.common.BizBillStatus;
 import com.huigou.uasp.bmp.operator.OperatorApplication;
 import com.huigou.uasp.bpm.FlowBroker;
@@ -50,6 +54,11 @@ public class ClientMaterialsApplicationImpl extends FlowBroker implements Client
     @Autowired
     private ClientMaterialsRepository clientMaterialsRepository;
 
+    @Autowired
+    private ClientMaterialsItemRepository clientMaterialsItemRepository;
+
+    @Autowired
+    private ClientMaterialsItemApplication clientMaterialsItemApplication;
     @Autowired
     private WorkflowApplication workflowApplication;
     @Autowired
@@ -92,10 +101,10 @@ public class ClientMaterialsApplicationImpl extends FlowBroker implements Client
     public void deleteByIds(List<String> ids) {
         ids.forEach(id->{
              clientMaterialsRepository.delete(id);
-//            List<ClientMaterialsItem> list=ClientMaterialsItemRepository.findByClientMaterialsId(id);
-//            for (ClientMaterialsItem ClientMaterialsItem:list){
-//                ClientMaterialsItemRepository.delete(ClientMaterialsItem);
-//            }
+            List<ClientMaterialsItem> list=clientMaterialsItemRepository.findByClientMaterialsId(id);
+            for (ClientMaterialsItem clientMaterialsItem:list){
+                clientMaterialsItemRepository.delete(clientMaterialsItem);
+            }
         });
     }
 
@@ -155,6 +164,11 @@ public class ClientMaterialsApplicationImpl extends FlowBroker implements Client
             clientMaterials = (ClientMaterials) commonDomainService.loadAndFillinProperties(clientMaterials);
         }
         clientMaterials = clientMaterialsRepository.save(clientMaterials);
+        List<ClientMaterialsItem> items = getBizEntities(ClientMaterialsItem.class, "items");
+        if (items.size()<1){
+            throw new IllegalArgumentException("没有客户供料通知明细信息!");
+        }
+        clientMaterialsItemApplication.saveClientMaterialsItems(clientMaterials.getId(),items);
 //        List<ClientMaterialsItem> items = getBizEntities(ClientMaterialsItem.class, "items");
 //        if (items.size()<1){
 //           throw new IllegalArgumentException("没有补充发料明细信息!");

topsun/src/main/java/com/huigou/topsun/sap/clientMaterials/application/impl/ClientMaterialsItemApplicationImpl.java

+package com.huigou.topsun.sap.clientMaterials.application.impl;
+
+import com.huigou.data.query.model.QueryDescriptor;
+import com.huigou.data.query.model.QueryModel;
+import com.huigou.topsun.sap.clientMaterials.application.ClientMaterialsItemApplication;
+import com.huigou.topsun.sap.clientMaterials.domain.ClientMaterialsItem;
+import com.huigou.topsun.sap.clientMaterials.domain.query.ClientMaterialsQueryRequest;
+import com.huigou.topsun.sap.clientMaterials.repository.ClientMaterialsItemRepository;
+import com.huigou.topsun.sap.componentSupply.application.ComponentSupplyItemApplication;
+import com.huigou.topsun.sap.componentSupply.domain.ComponentSupplyItem;
+import com.huigou.topsun.sap.componentSupply.domain.query.ComponentSupplyQueryRequest;
+import com.huigou.topsun.sap.componentSupply.repository.ComponentSupplyItemRepository;
+import com.huigou.uasp.bmp.common.application.BaseApplication;
+import com.huigou.util.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Auther: LXH
+ * @Date: 2024/07/25/10:16
+ * @Description:
+ */
+@Service("clientMaterialsItemApplication")
+public class ClientMaterialsItemApplicationImpl extends BaseApplication implements ClientMaterialsItemApplication {
+    @Autowired
+    private ClientMaterialsItemRepository clientMaterialsItemRepository;
+    @Override
+    public void saveClientMaterialsItems(String clientMaterialsId, List<ClientMaterialsItem> items){
+        for (ClientMaterialsItem item : items) {
+            item.setClientMaterialsId(clientMaterialsId);
+            clientMaterialsItemRepository.save(item);
+        }
+    }
+
+    @Override
+    public Map<String, Object> queryClientMaterialsItems(ClientMaterialsQueryRequest queryRequest){
+        Map<String, Object> map = new HashMap<>();
+        if (StringUtil.isNotBlank(queryRequest.getClientMaterialsId())){
+            QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "clientMaterialsItems");
+
+            QueryModel queryModel = this.sqlExecutorDao.getQueryModel(queryDescriptor, queryRequest);
+            if (queryRequest.getClientMaterialsId() != null) {
+                queryModel.addCriteria(" and t.client_materials_id =:clientMaterialsId");
+                queryModel.putParam("clientMaterialsId", queryRequest.getClientMaterialsId());
+            }
+           // queryModel.putDictionary("unit", DictUtil.getDictionary("ComponentSupplyUnit"));
+            map = this.sqlExecutorDao.executeSlicedQuery(queryModel);
+        }
+        return map;
+    }
+
+    @Override
+    public void deleteByIds(List<String> ids) {
+        ids.forEach(id->{
+            clientMaterialsItemRepository.delete(id);
+        });
+    }
+
+    @Override
+    public List<ClientMaterialsItem> findByClientMaterialsId(String clientMaterialsId) {
+        return clientMaterialsItemRepository.findByClientMaterialsId(clientMaterialsId);
+    }
+}

topsun/src/main/java/com/huigou/topsun/sap/clientMaterials/controller/ClientMaterialsItemController.java

+package com.huigou.topsun.sap.clientMaterials.controller;
+
+import com.huigou.topsun.sap.clientMaterials.application.ClientMaterialsItemApplication;
+import com.huigou.topsun.sap.clientMaterials.domain.query.ClientMaterialsQueryRequest;
+import com.huigou.topsun.sap.componentSupply.application.ComponentSupplyItemApplication;
+import com.huigou.topsun.sap.componentSupply.domain.query.ComponentSupplyQueryRequest;
+import com.huigou.uasp.annotation.ControllerMapping;
+import com.huigou.uasp.client.CommonController;
+import com.huigou.util.SDO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Auther: LXH
+ * @Date:  2024/07/25 10:10
+ * @Description:
+ */
+@Controller
+@ControllerMapping("/clientMaterials")
+public class ClientMaterialsItemController extends CommonController {
+    @Autowired
+    private ClientMaterialsItemApplication clientMaterialsItemApplication;
+
+    public String queryClientMaterialsItems(){
+        SDO sdo = this.getSDO();
+        ClientMaterialsQueryRequest queryRequest = sdo.toQueryRequest(ClientMaterialsQueryRequest.class);
+        Map<String, Object> map = clientMaterialsItemApplication.queryClientMaterialsItems(queryRequest);
+        return toResult(map);
+    }
+
+    public String deleteClientMaterialsItems(){
+        SDO sdo = this.getSDO();
+        List<String> ids = sdo.getIds();
+        clientMaterialsItemApplication.deleteByIds(ids);
+        return success();
+    }
+}

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

+package com.huigou.topsun.sap.clientMaterials.domain;
+
+import com.huigou.data.domain.model.AbstractEntity;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.math.BigDecimal;
+
+/**
+ * SAP客户供料通知明细
+ *
+ * @TableName sap_client_materials_item
+ */
+@Table(name = "sap_client_materials_item")
+@Entity
+@Data
+public class ClientMaterialsItem extends AbstractEntity {
+    /**
+     * SAP客户供料通知id
+     */
+    @Column(name = "client_materials_id")
+    private String clientMaterialsId;
+
+    /**
+     * 产品物料
+     */
+    @Column(name = "product_material")
+    private String productMaterial;
+
+    /**
+     * 产品物料名称
+     */
+    @Column(name = "product_material_name")
+    private String productMaterialName;
+
+
+    /**
+     * 供给物料
+     */
+    @Column(name = "supply_material")
+    private String supplyMaterial;
+
+    /**
+     * 供给物料名称
+     */
+    @Column(name = "supply_material_name")
+    private String supplyMaterialName;
+
+    /**
+     * 补发数量
+     */
+    @Column(name = "quantity")
+    private BigDecimal quantity;
+
+    /**
+     * 提货方式
+     */
+    @Column(name = "delivery_method")
+    private String deliveryMethod;
+
+
+    /**
+     * 备注
+     */
+    @Column(name = "remark")
+    private String remark;
+
+
+}
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/sap/clientMaterials/domain/query/ClientMaterialsQueryRequest.java

@@ -14,4 +14,5 @@ public class ClientMaterialsQueryRequest extends QueryAbstractRequest {
     private String  billCode;
     private String  remark;
     private String  status;
+    private String  clientMaterialsId;
 }

topsun/src/main/java/com/huigou/topsun/sap/clientMaterials/repository/ClientMaterialsItemRepository.java

+package com.huigou.topsun.sap.clientMaterials.repository;
+
+import com.huigou.topsun.sap.clientMaterials.domain.ClientMaterialsItem;
+import com.huigou.topsun.sap.componentSupply.domain.ComponentSupplyItem;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+
+/**
+ * @Auther: LXH
+ * @Date: 2024/07/25  16:33
+ * @Description:
+ */
+public interface ClientMaterialsItemRepository extends JpaRepository<ClientMaterialsItem,String> {
+    List<ClientMaterialsItem> findByClientMaterialsId(String clientMaterialsId);
+}

topsun/src/main/java/com/huigou/topsun/sap/nonProducePick/domain/NonProducePickItem.java

@@ -72,4 +72,19 @@ public class NonProducePickItem extends AbstractEntity {
     @Column(name = "WEMPF")
     private String wempf;
 
+
+    /**
+     *用途
+     */
+    @Column(name = "used")
+    private String used;
+
+
+    /**
+     *备注
+     */
+    @Column(name = "remark")
+    private String remark;
+
+
 }

topsun/src/main/java/com/huigou/topsun/sap/transfers/domain/SapStockTransfersItem.java

@@ -72,4 +72,10 @@ public class SapStockTransfersItem extends AbstractEntity {
     @Column(name = "meins_name")
     private String meinsName;
 
+
+    /**
+     * 备注
+     */
+    @Column(name = "remark")
+    private String remark;
 }
\ No newline at end of file

topsun/src/main/resources/config/topsun/sap/clientMaterials/clientMaterialsItem.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<query-mappings>
+    <query name="clientMaterialsItems" label="客户供料通知明细" table="sap_client_materials_item">
+        <sql-query>
+            select t.* from sap_client_materials_item t
+        </sql-query>
+        <condition column="client_materials_id" name="clientMaterialsId" type="java.lang.String" symbol="=" alias="t"/>
+    </query>
+
+</query-mappings>
\ No newline at end of file