申请改

topsun-xt/src/main/webapp/biz/topsun/proofing/proofingMakeList.js

@@ -14,8 +14,7 @@ function loadProofingMakeListGrid() {
         updateHandler: function (){
             updateHandler()
         },
-
-        // deleteHandler: deleteHandler
+        deleteHandler: deleteHandler
     });
     gridManager = UICtrl.grid("#proofingMakeTableGrid", {
         columns: [

topsun-xt/src/main/webapp/biz/topsun/proofing/workInstructionApplyList.js

 var gridManager = null;
 
 $(document).ready(function () {
-    debugger
     initializateUI();
     loadWorkInstructionApplyListGrid();
 });
@@ -22,13 +21,14 @@ function loadWorkInstructionApplyListGrid() {
             {display: "规格书编号", name: "specificationNo", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "换算值", name: "matrixingValue", width: 120, minWidth: 60, type: "string", align: "left"},
             {display: "尺码组", name: "sizeGroup", width: 120, minWidth: 60, type: "string", align: "left"},
-            {display: "是否禁用", name: "isDisable", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "是否禁用", name: "isDisableTextView", width: 140, minWidth: 60, type: "string", align: "left"}
          ],
         dataAction: "server",
         url: web_app.name + '/workInstructionApply/slicedQueryWorkInstructionApplyList.ajax',
         pageSize: 10,
         usePager: true,
         toolbar: toolbarOptions,
+        enabledEdit: true,
         width: "100%",
         height: "100%",
         heightDiff: -8,
@@ -88,14 +88,6 @@ function updateHandler(row) {
     });
 }
 
-//重写DataUtil的getUpdateRowId函数、它默认取行的id列
-// DataUtil.getUpdateRowId = function (gridManager) {
-//     var result = DataUtil.getUpdateRow(gridManager);
-//     if (result) {
-//         return result.proofingMakeId;
-//     }
-//     return result;
-// }
 
 //删除按钮
 function deleteHandler() {

topsun-xt/src/main/webapp/biz/topsun/proofing/workInstructionList.js

@@ -23,11 +23,11 @@ function loadWorkInstructionListGrid() {
             {display: "产品类别", name: "productType", width: 120, minWidth: 60, type: "string", align: "left"},
             {display: "产品单位", name: "productUnit", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "尺码组id", name: "sizeGroupId", width: 140, minWidth: 60, type: "string", align: "left"},
-            {display: "是否为唯一码产品", name: "isOnlyCode", width: 140, minWidth: 60, type: "string", align: "left"},
-            {display: "是否不考虑形体配色", name: "isBodyColor", width: 140, minWidth: 60, type: "string", align: "left"},
-            {display: "是否禁用", name: "isDisable", width: 140, minWidth: 60, type: "string", align: "left"},
-            {display: "是否创建新规格书", name: "isNewSpecification", width: 140, minWidth: 60, type: "string", align: "left"},
-            {display: "是否建立bom表", name: "isBuildBom", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "是否为唯一码产品", name: "isOnlyCodeTextView", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "是否不考虑形体配色", name: "isBodyColorTextView", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "是否禁用", name: "isDisableTextView", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "是否创建新规格书", name: "isNewSpecificationTextView", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "是否建立bom表", name: "isBuildBomTextView", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "确认日期", name: "confirmDate", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "确认人", name: "comfirmPerson", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "样品单号", name: "sampleOrderNo", width: 140, minWidth: 60, type: "string", align: "left"},

topsun/src/main/java/com/huigou/topsun/proofing/application/impl/ProofingMakeApplicationImpl.java

@@ -183,8 +183,9 @@ public class ProofingMakeApplicationImpl extends BaseApplication implements Proo
     @Override
     @Transactional(propagation = Propagation.REQUIRES_NEW)
     public void deleteProofingMakeById(String id) {
-
-
+        ProofingMakeBaseInfo proofingMakeBaseInfo = proofingMakeRepository.findOne(id);
+        proofingMakeBaseInfo.setIsDelete("1");
+        proofingMakeRepository.save(proofingMakeBaseInfo);
     }
 
     @Override

topsun/src/main/java/com/huigou/topsun/proofing/application/impl/WorkInstructionApplicationImpl.java

 package com.huigou.topsun.proofing.application.impl;
 
+import com.huigou.cache.DictUtil;
 import com.huigou.data.query.model.QueryDescriptor;
+import com.huigou.data.query.model.QueryModel;
 import com.huigou.topsun.proofing.application.WorkInstructionApplication;
 import com.huigou.topsun.proofing.domain.vo.WorkInstructionVo;
 import com.huigou.topsun.proofing.domain.workInstruction.model.*;
 import com.huigou.topsun.proofing.domain.workInstruction.query.WorkInstructionBaseInfoQueryRequest;
+import com.huigou.topsun.proofing.domain.workInstructionApply.model.WorkInstructionApply;
 import com.huigou.topsun.proofing.repository.workInstruction.*;
 import com.huigou.topsun.util.MyBaseUtil;
 import com.huigou.uasp.bmp.common.application.BaseApplication;
@@ -72,7 +75,14 @@ public class WorkInstructionApplicationImpl extends BaseApplication implements W
     @Override
     public Map<String, Object> slicedWorkInstructionBaseInfoList(WorkInstructionBaseInfoQueryRequest queryRequest) {
         QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "slicedWorkInstructionBaseInfoList");
-        return this.sqlExecutorDao.executeSlicedQuery(queryDescriptor,queryRequest);
+        QueryModel model = this.sqlExecutorDao.getQueryModel(queryDescriptor, queryRequest);
+        model.putDictionary("isOnlyCode", DictUtil.getDictionary("yesorno"));
+        model.putDictionary("isBodyColor", DictUtil.getDictionary("yesorno"));
+        model.putDictionary("isDisable", DictUtil.getDictionary("yesorno"));
+        model.putDictionary("isNewSpecification", DictUtil.getDictionary("yesorno"));
+        model.putDictionary("isBuildBom", DictUtil.getDictionary("yesorno"));
+
+        return this.sqlExecutorDao.executeSlicedQuery(model);
     }
 
     @Override
@@ -99,6 +109,9 @@ public class WorkInstructionApplicationImpl extends BaseApplication implements W
         workInstructionPrdLookedRepository.deleteByWorkInstructionBaseInfoId(id);
         workInstructionProductLossRepository.deleteByWorkInstructionBaseInfoId(id);
         workInstructionRepository.delete(id);
+//        WorkInstructionBaseInfo workInstructionBaseInfo = workInstructionRepository.findOne(id);
+//        workInstructionBaseInfo.setIsDelete("1");
+//        workInstructionRepository.save(workInstructionBaseInfo);
     }
 
     @Override

topsun/src/main/java/com/huigou/topsun/proofing/application/impl/WorkInstructionApplyApplicationImpl.java

 package com.huigou.topsun.proofing.application.impl;
 
+import com.huigou.cache.DictUtil;
 import com.huigou.data.query.model.QueryDescriptor;
+import com.huigou.data.query.model.QueryModel;
 import com.huigou.topsun.proofing.application.WorkInstructionApplyApplication;
 import com.huigou.topsun.proofing.domain.workInstructionApply.model.WorkInstructionApply;
 import com.huigou.topsun.proofing.domain.workInstructionApply.query.WorkInstructionApplyQueryRequest;
@@ -28,7 +30,9 @@ public class WorkInstructionApplyApplicationImpl extends BaseApplication impleme
     @Override
     public Map<String, Object> slicedWorkInstructionApplyList(WorkInstructionApplyQueryRequest query) {
         QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "slicedWorkInstructionApplyList");
-        return this.sqlExecutorDao.executeSlicedQuery(queryDescriptor,query);
+        QueryModel model = this.sqlExecutorDao.getQueryModel(queryDescriptor, query);
+        model.putDictionary("isDisable", DictUtil.getDictionary("yesorno"));
+        return this.sqlExecutorDao.executeSlicedQuery(model);
     }
 
     @Override
@@ -39,7 +43,10 @@ public class WorkInstructionApplyApplicationImpl extends BaseApplication impleme
     @Override
     @Transactional(propagation = Propagation.REQUIRES_NEW)
     public void deleteWorkInstructionById(String id) {
-        workInstructionApplyRepository.delete(id);
+//        workInstructionApplyRepository.delete(id);
+        WorkInstructionApply workInstructionApply = workInstructionApplyRepository.findOne(id);
+        workInstructionApply.setIsDelete("1");
+        workInstructionApplyRepository.save(workInstructionApply);
     }
 
     @Override

topsun/src/main/java/com/huigou/topsun/proofing/domain/proofingMake/model/ProofingMakeBaseInfo.java

@@ -15,6 +15,8 @@ import java.util.Date;
 @Entity
 @Data
 public class ProofingMakeBaseInfo implements Serializable {
+
+
     /**
      * 制作单id
      */
@@ -196,5 +198,14 @@ public class ProofingMakeBaseInfo implements Serializable {
     @Column(name = "standard_color")
     private String standardColor;
 
+    /**
+     * 是否删除
+     */
+    @Column(name = "is_delete")
+    private String isDelete;
+
+    public ProofingMakeBaseInfo(){
+        this.isDelete="0";
+    }
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/proofing/domain/workInstructionApply/model/WorkInstructionApply.java

@@ -129,5 +129,13 @@ public class WorkInstructionApply implements Serializable {
     @Column(name = "is_body_color")
     private String isBodyColor;
 
+    /**
+     * 是否删除
+     */
+    @Column(name = "is_delete")
+    private String isDelete;
+    public WorkInstructionApply(){
+        this.isDelete="0";
+    }
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

topsun/src/main/resources/config/content/easysearch/easy-search-product.xml

@@ -63,6 +63,7 @@
             inner JOIN proofing_make_pd_published_conf pc ON pc.proofing_make_id = pi.proofing_make_id
             inner join product p on pi.product_code=p.product_code
             inner join product_detail pd on pd.product_id=p.product_id
+            where pi.is_delete=0 and wa.is_delete=0
         </sql>
         <field name="产品id" title="产品id" code="productId" width="200" />
         <field name="产品编号" title="产品编号" code="productCode" width="200" />
@@ -84,7 +85,7 @@
 
 
         <field name="制造单号" title="制造单号" code="proofingMakeNo" width="200"/>
-        <field name="指导申请书单号" title="指导申请书单号" code="workInstructionBaseInfoId" width="200"/>
+        <field name="指导申请书单号" title="指导申请书单号" code="workInstructionApplyId" width="200"/>
         <field name="长;单位cm" title="长;单位cm" code="productLength" width="200" type='hidden'/>
         <field name="宽;单位cm" title="宽;单位cm" code="productWidth" width="200" type='hidden'/>
         <field name="高;单位cm" title="高;单位cm" code="productHeight" width="200" type='hidden'/>

topsun/src/main/resources/config/content/easysearch/easy-search-proofing.xml

@@ -6,7 +6,7 @@
             select pa.proofing_apply_no,pa.proofing_apply_id,pa.product_id,p.product_code
             from proofing_apply_base_info pa
             inner join product p on(pa.product_id=p.product_id)
-            where pa.proofing_apply_application_status != 2
+            where pa.proofing_apply_application_status != 2 and pa.status =3
         </sql>
         <field name="申请单号" title="申请单号" code="proofingApplyNo" width="200" />
         <field name="申请Id" title="申请Id" code="proofingApplyId" width="200" />
@@ -47,6 +47,7 @@
             proofing_make_base_info pm
             inner join product p on(pm.product_id=p.product_id)
 <!--            where pm.proofing_make_application_status ="normal"-->
+            where pm.is_delete = 0
         </sql>
         <field name="产品Id" title="产品Id" code="productId" width="200" />
         <field name="产品编号" title="产品编号" code="productCode" width="200" />

topsun/src/main/resources/config/topsun/proofing/proofingMake.xml

@@ -7,6 +7,7 @@
             pm.*
             FROM
             proofing_make_base_info pm
+            where pm.is_delete = 0
         </sql-query>
     </query>
     <query name="slicedProofingMakeTechnology" table="proofing_Make_technology">

topsun/src/main/resources/config/topsun/proofing/workInstructionApply.xml

@@ -7,6 +7,9 @@
                 wa.*
                 FROM
                 work_instruction_apply wa
+                inner join proofing_make_base_info pi
+                on wa.proofing_make_id= pi.proofing_make_id
+                where wa.is_delete = 0 and pi.is_delete=0
             </sql-query>
         </query>
 </query-mappings>
\ No newline at end of file