领料增加是否冲销标识

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

@@ -30,6 +30,7 @@
             <x:hidden name="kostl"/>
             <x:inputC name="aufnrName" required="false" label="内部订单" labelCol="2" fieldCol="2" wrapper="select"/>
             <x:inputC name="message" required="false" label="领料单号" readonly="true" labelCol="2" fieldCol="2"/>
+            <%--<x:selectC name="isChargeOff" required="false" label="是否冲销" disabled="true" labelCol="2" fieldCol="2"/>--%>
             <x:hidden name="aufnr"/>
         </div>
     </div>

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

@@ -16,11 +16,17 @@ function loadGrid() {
                 printHandler();
             }
         },
+        // chargeOffHandler: {
+        //     id: 'chargeOff', text: '冲销', img:'fa-edit', click: function(){
+        //         chargeOffHandler();
+        //     }
+        // },
     });
     gridManager = UICtrl.grid("#maingrid", {
         columns: [
             {display: "单据编号", name: "billCode", width: 150, minWidth: 60, type: "string", align: "left"},
             {display: "领料单号", name: "message", width: 200, minWidth: 60, type: "string", align: "left"},
+            //{display: "是否冲销", name: "isChargeOffTextView", width: 100, minWidth: 60, type: "string", align: "left"},
             {display: "创建日期", name: "fillinDate", width: 120, minWidth: 60, type: "string", align: "left"},
             {display: "申请人", name: "personMemberName", width: 120, minWidth: 60, type: "string", align: "left"},
             {display: "申请部门", name: "deptName", width: 120, minWidth: 60, type: "string", align: "left"},
@@ -99,3 +105,22 @@ function printHandler(){
     var url='/nonProducePick/print.load';
     Public.openPostWindow(web_app.name+url,{id :row.id});
 }
+
+function chargeOffHandler(){
+    var row = DataUtil.getUpdateRow(gridManager);
+    if (!row) {
+        return;
+    }
+    if (row.status!= 3){
+        Public.tip("请审批完成再冲销!");
+        return;
+    }
+    if (row.isChargeOff == 1){
+        Public.tip("已冲销的不能再冲销!");
+        return;
+    }
+    var url='/nonProducePick/chargeOff.ajax';
+    Public.ajax(web_app.name+url,{message :row.message},function(data){
+        reloadGrid();
+    })
+}

topsun/src/main/java/com/huigou/topsun/sap/nonProducePick/application/NonProducePickApplication.java

@@ -26,4 +26,5 @@ public interface NonProducePickApplication {
 
     public void sendNonProducePickData(NonProducePick nonProducePick,String ztype);
 
+    void chargeOff(String message);
 }

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

@@ -134,6 +134,11 @@ public class NonProducePickApplicationImpl extends FlowBroker implements NonProd
         }
     }
 
+    @Override
+    public void chargeOff(String message) {
+        //TODO
+    }
+
     @Override
     protected String saveBizAndApprovalData() {
         super.saveBizAndApprovalData();

topsun/src/main/java/com/huigou/topsun/sap/nonProducePick/controller/NonProducePickController.java

@@ -72,6 +72,7 @@ public class NonProducePickController extends CommonController {
          */
         Operator operator = getOperator();
         nonProducePick.setDefaultValues(new OrgUnit(operator.getFullId(), operator.getFullName()));
+        nonProducePick.setIsChargeOff("0");
         return forward("nonProducePickDetail",nonProducePick);
     }
 
@@ -118,4 +119,11 @@ public class NonProducePickController extends CommonController {
         String pintPage = String.format("/print/topsun/nonProducePick.ftl");
         return outputAndProcUnitHandlerPDF(pintPage, id, map);
     }
+
+    public String chargeOff(){
+        SDO sdo = this.getSDO();
+        String message = sdo.getString("message");
+        nonProducePickApplication.chargeOff(message);
+        return success();
+    }
 }

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

@@ -49,6 +49,12 @@ public class NonProducePick extends FlowBillAbstractEntity {
     @Column(name = "message")
     private String message;
 
+    /**
+     * 是否冲销  1：是  0：否
+     */
+    @Column(name = "is_charge_off")
+    private String isChargeOff;
+
     @Override
     protected String getCodeRuleId() {
         return "nonProducePick";