ECN变更单复制功能

topsun-xt/src/main/webapp/biz/topsun/ep/change/epChangeFormDetail.js

@@ -251,7 +251,7 @@ function loadGrid() {
         url: web_app.name + '/epChangeForm/slicedEpChangeFormImplItems.ajax',
         pageSize: 10,
         usePager: true,
-        parms:{epChangeFormId:getId()},
+        parms:{epChangeFormId:getId(),oldId:$('#oldId').val()},
         toolbar: toolbarOptions,
         enabledEdit: true,
         width: "100%",
@@ -358,7 +358,7 @@ function loadStockGrid() {
         url: web_app.name + '/epChangeForm/slicedEpChangeFormStockItems.ajax',
         pageSize: 10,
         usePager: true,
-        parms:{epChangeFormId:getId()},
+        parms:{epChangeFormId:getId(),oldId:$('#oldId').val()},
         toolbar: toolbarOptions,
         enabledEdit: true,
         width: "100%",

topsun-xt/src/main/webapp/biz/topsun/ep/change/epChangeFormDetail.jsp

@@ -23,6 +23,7 @@
     <x:hidden name="personMemberId"/>
     <x:hidden name="personMemberName"/>
     <x:hidden name="statusId"/>
+    <x:hidden name="oldId"/>
     <div class="hg-form-cols">
         <div class="hg-form-row">
             <x:inputC name="changeNo" required="true" label="变更序号" labelCol="2" maxLength="64" fieldCol="2" />

topsun-xt/src/main/webapp/biz/topsun/ep/change/epChangeFormList.js

@@ -25,6 +25,11 @@ function loadGrid() {
                 printHandler();
             }
         },
+        copyHandler:{
+            id: 'copyHandler', text: "复制", img:'fa-clipboard', click: function(){
+                copyQualityInfoRecord();
+            }
+        }
     });
     gridManager = UICtrl.grid("#maingrid", {
         columns: [
@@ -124,3 +129,15 @@ function printHandler(){
     var url='/epChangeForm/print.load';
     Public.openPostWindow(web_app.name+url,{id :row.id});
 }
+
+function copyQualityInfoRecord(){
+    var row = gridManager.getSelectedRow();
+    if (!row) {
+        return;
+    }
+    UICtrl.addTabItem({
+        tabid: 'epChangeForm',
+        text: '新增变更申请/通知单',
+        url: web_app.name + '/epChangeForm/copyEpChangeForm.job?id=' + row.id
+    });
+}

topsun-xt/src/main/webapp/biz/topsun/ep/change/epMaterialChangeFormDetail.js

@@ -171,7 +171,7 @@ function loadGrid() {
         url: web_app.name + '/epChangeForm/slicedEpChangeFormImplItems.ajax',
         pageSize: 10,
         usePager: true,
-        parms:{epChangeFormId:getId()},
+        parms:{epChangeFormId:getId(),oldId:$('#oldId').val()},
         toolbar: toolbarOptions,
         enabledEdit: true,
         width: "100%",
@@ -278,7 +278,7 @@ function loadStockGrid() {
         url: web_app.name + '/epChangeForm/slicedEpChangeFormStockItems.ajax',
         pageSize: 10,
         usePager: true,
-        parms:{epChangeFormId:getId()},
+        parms:{epChangeFormId:getId(),oldId:$('#oldId').val()},
         toolbar: toolbarOptions,
         enabledEdit: true,
         width: "100%",

topsun-xt/src/main/webapp/biz/topsun/ep/change/epMaterialChangeFormDetail.jsp

@@ -23,6 +23,7 @@
     <x:hidden name="personMemberId"/>
     <x:hidden name="personMemberName"/>
     <x:hidden name="statusId"/>
+    <x:hidden name="oldId"/>
         <x:hidden name="reasonForChange"/>
     <div class="hg-form-cols">
         <div class="hg-form-row">

topsun/src/main/java/com/huigou/topsun/ep/change/application/EpChangeFormImplItemApplication.java

@@ -18,4 +18,6 @@ public interface EpChangeFormImplItemApplication {
     void saveEpChangeFormImplItems(String epChangeFormId,List<EpChangeFormImplItem> items);
 
     void deleteItems(List<String> ids);
+
+    Map<String, Object> findByOldId(EpChangeFormQueryRequest queryRequest);
 }

topsun/src/main/java/com/huigou/topsun/ep/change/application/EpChangeFormStockItemApplication.java

@@ -18,4 +18,6 @@ public interface EpChangeFormStockItemApplication {
     void saveEpChangeFormStockItems(String epChangeFormId,List<EpChangeFormStockItem> epChangeFormStockItems);
 
     void deleteItems(List<String> ids);
+
+    Map<String, Object> findByOldId(EpChangeFormQueryRequest queryRequest);
 }

topsun/src/main/java/com/huigou/topsun/ep/change/application/impl/EpChangeFormImplItemApplicationImpl.java

@@ -51,4 +51,12 @@ public class EpChangeFormImplItemApplicationImpl extends BaseApplication impleme
             changeFormImplItemRepository.delete(id);
         }
     }
+
+    @Override
+    public Map<String, Object> findByOldId(EpChangeFormQueryRequest queryRequest) {
+        QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "epChangeFormItemByOldId");
+        QueryModel queryModel = this.sqlExecutorDao.getQueryModel(queryDescriptor, queryRequest);
+        queryModel.putDictionary("confirm", DictUtil.getDictionary("confirm"));
+        return this.sqlExecutorDao.executeSlicedQuery(queryModel);
+    }
 }

topsun/src/main/java/com/huigou/topsun/ep/change/application/impl/EpChangeFormStockItemApplicationImpl.java

@@ -52,4 +52,12 @@ public class EpChangeFormStockItemApplicationImpl extends BaseApplication implem
             changeFormStockItemRepository.delete(id);
         }
     }
+
+    @Override
+    public Map<String, Object> findByOldId(EpChangeFormQueryRequest queryRequest) {
+        QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "epChangeFormStockItemByOldId");
+        QueryModel queryModel = this.sqlExecutorDao.getQueryModel(queryDescriptor, queryRequest);
+        queryModel.putDictionary("confirm", DictUtil.getDictionary("confirm"));
+        return this.sqlExecutorDao.executeSlicedQuery(queryModel);
+    }
 }

topsun/src/main/java/com/huigou/topsun/ep/change/controller/EpChangeFormController.java

@@ -8,11 +8,15 @@ import com.huigou.topsun.ep.change.application.EpChangeFormImplItemApplication;
 import com.huigou.topsun.ep.change.application.EpChangeFormStockItemApplication;
 import com.huigou.topsun.ep.change.domain.EpChangeForm;
 import com.huigou.topsun.ep.change.domain.query.EpChangeFormQueryRequest;
+import com.huigou.topsun.sap.purchaseInfoRecord.application.SapPurchaseInfoRecordApplication;
+import com.huigou.topsun.sap.purchaseInfoRecord.domain.SapPurchaseInfoRecord;
 import com.huigou.uasp.annotation.ControllerMapping;
 import com.huigou.uasp.bmp.common.BizBillStatus;
 import com.huigou.uasp.bpm.engine.application.ActApplication;
 import com.huigou.uasp.client.CommonController;
+import com.huigou.util.ClassHelper;
 import com.huigou.util.SDO;
+import com.huigou.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 
@@ -93,14 +97,27 @@ public class EpChangeFormController extends CommonController {
     public String slicedEpChangeFormImplItems(){
         SDO sdo = this.getSDO();
         EpChangeFormQueryRequest queryRequest = sdo.toQueryRequest(EpChangeFormQueryRequest.class);
-        return toResult(changeFormImplItemApplication.findByEpChangeFormId(queryRequest));
+        Map<String, Object> map = new HashMap<>();
+        if (StringUtil.isNotBlank(queryRequest.getEpChangeFormId())){
+            map = changeFormImplItemApplication.findByEpChangeFormId(queryRequest);
+        }
+        if (StringUtil.isNotBlank(queryRequest.getOldId()) && StringUtil.isBlank(queryRequest.getEpChangeFormId())){
+            map = changeFormImplItemApplication.findByOldId(queryRequest);
+        }
+        return toResult(map);
     }
 
     public String slicedEpChangeFormStockItems(){
         SDO sdo = this.getSDO();
         EpChangeFormQueryRequest queryRequest = sdo.toQueryRequest(EpChangeFormQueryRequest.class);
-        //String epChangeFormId = sdo.getString("epChangeFormId");
-        return toResult(changeFormStockItemApplication.findByEpChangeFormId(queryRequest));
+        Map<String, Object> map = new HashMap<>();
+        if (StringUtil.isNotBlank(queryRequest.getEpChangeFormId())){
+            map = changeFormStockItemApplication.findByEpChangeFormId(queryRequest);
+        }
+        if (StringUtil.isNotBlank(queryRequest.getOldId()) && StringUtil.isBlank(queryRequest.getEpChangeFormId())){
+            map = changeFormStockItemApplication.findByOldId(queryRequest);
+        }
+        return toResult(map);
     }
 
     public String deleteEpChangeFormImplItem(){
@@ -130,4 +147,38 @@ public class EpChangeFormController extends CommonController {
         String pintPage = String.format((String) map.get("printPage"));
         return outputAndProcUnitHandlerPDF(pintPage, id, map);
     }
+
+    /**
+     * 复制功能
+     * @return
+     */
+    public String copyEpChangeForm(){
+        /**
+         * 设置jsp页面初始化填充数据，如果不设置， 那么在jsp页面上填写完表单之后立即提交申请TaskDescription获取不到时间和相关人员信息
+         */
+        SDO sdo = this.getSDO();
+        String id = sdo.getString("id");
+        this.putAttribute("oldId", id);
+        this.putAttribute("processDefinitionKey", EpChangeFormApplication.PROCESS_DEFINITION_KEY);
+        // 新增的时候procUnitId一定要设置成Apply，不然jsp页面的所有表单元素是readonly状态
+        this.putAttribute("procUnitId", "Apply");
+        EpChangeForm epChangeFormDb = epChangeFormApplication.findEpChangeFormById(id);
+        EpChangeForm epChangeForm = new EpChangeForm();
+        ClassHelper.copyProperties(epChangeFormDb,epChangeForm);
+        epChangeForm.setId("");
+        epChangeForm.setBillCode("");
+        epChangeForm.setCode("");
+        epChangeForm.setMsg("");
+        epChangeForm.setStatusId(BizBillStatus.APPLYING.getId());
+        Operator operator = getOperator();
+        epChangeForm.setDefaultValues(new OrgUnit(operator.getFullId(), operator.getFullName()));
+        Map<String, String> reasonForChange = new HashMap<>();
+        if ("".equals(epChangeForm.getReasonForChange())){
+            return forward("epMaterialChangeFormDetail",epChangeForm);
+        }else {
+            reasonForChange = DictUtil.getDictionary("reasonForChange");
+            this.putAttribute("reasonForChangeList",reasonForChange);
+            return forward("epChangeFormDetail",epChangeForm);
+        }
+    }
 }

topsun/src/main/java/com/huigou/topsun/ep/change/domain/query/EpChangeFormQueryRequest.java

@@ -13,4 +13,5 @@ public class EpChangeFormQueryRequest extends QueryAbstractRequest {
     private String billCode;
     private String epChangeFormId;
     private String id;
+    private String oldId;
 }

topsun/src/main/resources/config/topsun/ep/change/epChangeForm.xml

 <?xml version="1.0" encoding="UTF-8" ?>
 <query-mappings>
-    <query name="epChangeForm" label="EP销售订单" table="ep_change_form">
+    <query name="epChangeForm" label="EP变更单" table="ep_change_form">
         <sql-query>
             select t.* from ep_change_form t
         </sql-query>
@@ -8,18 +8,25 @@
         <condition column="id" name="id" type="java.lang.String" symbol="=" alias="t"/>
     </query>
 
-    <query name="epSaleOrderItems" label="EP销售订单明细" table="ep_sale_order_item">
+    <query name="epChangeFormStockItem">
         <sql-query>
-            select t.* from ep_sale_order_item t
+            select t.* from ep_change_form_stock_item t where 1=1
         </sql-query>
-        <condition column="ep_sale_order_id" name="epSaleOrderId" type="java.lang.String" symbol="=" alias="t"/>
+        <condition column="ep_change_form_id" name="epChangeFormId" type="java.lang.String" symbol="=" alias="t"/>
     </query>
 
-    <query name="epChangeFormStockItem">
+    <query name="epChangeFormStockItemByOldId">
         <sql-query>
-            select t.* from ep_change_form_stock_item t where 1=1
+            select t.dept_id,
+            t.dept_name,
+            t.description,
+            t.confirm,
+            t.date,
+            t.executor_id,
+            t.executor,
+            t.comments from ep_change_form_stock_item t where 1=1
         </sql-query>
-        <condition column="ep_change_form_id" name="epChangeFormId" type="java.lang.String" symbol="=" alias="t"/>
+        <condition column="ep_change_form_id" name="oldId" type="java.lang.String" symbol="=" alias="t"/>
     </query>
 
     <query name="epChangeFormImplItem">
@@ -29,6 +36,20 @@
         <condition column="ep_change_form_id" name="epChangeFormId" type="java.lang.String" symbol="=" alias="t"/>
     </query>
 
+    <query name="epChangeFormItemByOldId">
+        <sql-query>
+            select t.dept_id,
+            t.dept_name,
+            t.executor_id,
+            t.executor,
+            t.confirm,
+            t.date,
+            t.follow_matter,
+            t.comments from ep_change_form_impl_item t where 1=1
+        </sql-query>
+        <condition column="ep_change_form_id" name="oldId" type="java.lang.String" symbol="=" alias="t"/>
+    </query>
+
     <query name="queryApprovalPersons">
         <sql-query>
             <!--SELECT