废品销售单修改、物料主数据调整

topsun-xt/src/main/webapp/biz/topsun/sap/wasteSale/wasteSaleDetail.js

 var gridManager = null;
 
+
 $(document).ready(function () {
     initialize();
     loadGrid();
@@ -22,9 +23,12 @@ function bindEvent(){
 }
 
 function loadGrid() {
-    var toolbarOptions = UICtrl.getDefaultToolbarOptions({
+     var toolbarOptions ={ items: [] };
+     var subProcUnitId = getSubProcUnitId();
+       if (subProcUnitId !== "purchase" ) {
+        toolbarOptions = UICtrl.getDefaultToolbarOptions({
             addHandler: function () {
-            UICtrl.addGridRow(gridManager,{ sequence: (gridManager.getData().length + 1)});
+                UICtrl.addGridRow(gridManager, {sequence: (gridManager.getData().length + 1)});
             },
             deleteHandler: function () {
                 var _grid = UICtrl.getGridManager('#maingrid');
@@ -39,6 +43,8 @@ function loadGrid() {
                 });
             }
         });
+       }
+
     gridManager = UICtrl.grid("#maingrid", {
         columns: getGridColumns(),
         dataAction: "server",
@@ -60,6 +66,8 @@ function loadGrid() {
 
 function getGridColumns(){
     var columns=[];
+    var subProcUnitId = getSubProcUnitId();
+    var statusId = $("#statusId").val();
     columns.push({
         display: "序号", name: "sequence", width: 60, minWidth: 60, type: "string", align: "left",
     },)
@@ -105,21 +113,39 @@ function getGridColumns(){
             },
         }
     },)
+    if (subProcUnitId === "purchase" ) {
+        columns.push({
+            display: "毛重", name: "grossWeight", width: 120, minWidth: 60, type: "string", align: "left"
+        },)
+        columns.push({
+            display: "车辆皮重", name: "carWeight", width: 120, minWidth: 60, type: "string", align: "left"
+        },)
+    } else  {
         columns.push({
             display: "毛重", name: "grossWeight", width: 120, minWidth: 60, type: "string", align: "left",
             editor: {
-            required: false, type: "text",mask: '9999999.99'
+                required: false, type: "text", mask: '9999999.99'
             }
         },)
         columns.push({
             display: "车辆皮重", name: "carWeight", width: 120, minWidth: 60, type: "string", align: "left",
             editor: {
                 required: false, type: "text",mask: '9999999.99'
+            },
+            render: function (item) {
+                if (Public.isNotBlank(item.carWeight)) {
+                    if (MathUtil.sub(item.grossWeight, item.carWeight) <= 0) {
+                        Public.tip("毛重不能小于车辆皮重！");
+                        return false;
+                    }
+                }
+                return item.carWeight;
             }
         },)
+    }
+
+
 
-    var subProcUnitId = getSubProcUnitId();
-    var statusId = $("#statusId").val();
     if (subProcUnitId === "purchase" || statusId > 0){
         //采购部专员录入回收单价，自动计算出总价，补充收款账户
         columns.push({
@@ -128,10 +154,16 @@ function getGridColumns(){
                 required: false, type: "text",mask: '9999999.99'
             },
             render: function (item) {
-                if (Public.isNotBlank(item.deductWeight)) {
-                    var amount = MathUtil.sub(item.grossWeight, item.carWeight);
-                    var amount1 = MathUtil.sub(amount, item.deductWeight);
-                     item.quantity=amount1;
+                if (Public.isNotBlank(item.deductWeight)&&MathUtil.sub(item.deductWeight,0)>0) {
+                    var amount1 = MathUtil.sub(item.grossWeight, item.carWeight);
+                    var amount2 = MathUtil.sub(amount1, item.deductWeight);
+                    if (amount2<=0){
+                       Public.tip("毛重不能小于车辆皮重与扣减数量之和！");
+                       return false;
+                    }
+                    return  item.quantity=amount2,item.deductWeight;
+                    //return item.deductWeight;
+                } else {
                     return item.deductWeight;
                 }
                 if (Public.isNotBlank(item.quantity) && Public.isNotBlank(item.price)) {

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyApplicationImpl.java

@@ -597,7 +597,8 @@ public class NonProdApplyApplicationImpl  extends FlowBroker implements NonProdA
 
        BsnMessageSponsor bsnMessageSponsor = new BsnMessageSponsor();
        bsnMessageSponsor.setTaskSponsor(operator.getLoginUser().getId());
-       bsnMessageSponsor.setTitle(nonProdApplyBaseInfo.getGenericName());//通用品名
+       String genericName=nonProdApplyBaseInfo.getGenericName()!=null?nonProdApplyBaseInfo.getGenericName():"";
+       bsnMessageSponsor.setTitle(genericName);//通用品名
        bsnMessageSponsor.setExecutorUrl("sapNonProdApplyNext/forwardNonProdApplyNext.do?prod=1&isReadOnly=false");
        bsnMessageSponsor.setBusinessId(sapNonProdApplyDept.getApplyDeptId());
        bsnMessageSponsor.setCreateDate(new Date());

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/controller/NonProdApplyNextController.java

@@ -61,10 +61,12 @@ public class NonProdApplyNextController extends CommonController {
         SDO sdo = this.getSDO();
         String id = sdo.getBizId();
 //        this.putAttribute("active", ActiveStatus.UNFINISHED.getValue() );//定义流程环节的id
-        if (StringUtil.isNotBlank(sdo.getString("prod"))){  //首页进入的产品信息
+        if (StringUtil.isNotBlank(sdo.getString("prod"))){  //首页进入的产品信息 如果ID是传的ApplyDeptId
             SapNonProdApplyDept applyDept=nonProdApplyDeptApplication.getNonProdApplyDeptById(id);
+            if (applyDept!=null){
                id=applyDept.getBaseInfoId();
             }
+        }
         NonProdApplyBaseInfo nonProdApplyBaseInfo = nonProdApplyApplication.loadNonProdApplyBaseInfoById(id);
         nonProdApplyBaseInfo.setApplyType("0");
         this.putAttribute("applyType", "0");