add product packFlag 送货单原产地默认采购单-项次

src/main/resources/static/app/srm/deliveryOrder/query/query.js

@@ -74,7 +74,7 @@ angular.module('IOne').controller('DeliveryOrderQueryController', function ($sco
             {name: '物料名称', field: 'product.name', width: 150, cellTemplate: cellTemplate},
             {name: '物料规格', field: 'product.standard', width: 200, cellTemplate: cellTemplate},
             {name: '单位', field: 'unit', width: 80, cellTemplate: cellTemplate},
-            {name: '原产地', field: 'sourceArea', width: 100, cellTemplate: cellTemplate},
+            {name: '原产地', field: 'sourceArea', width: 130, cellTemplate: cellTemplate},
             {name: '批次号', field: 'batchId', width: 80, cellTemplate: cellTemplate},
             {name: '制造日期', field: 'manufacturingDate', cellFilter: 'date:"yyyy-MM-dd"', width: 100},
             {name: '数量', field: 'deliveryAmount', width: 80, cellTemplate: cellTemplate},

src/main/resources/static/app/srm/deliveryOrder/update/update.js

@@ -67,7 +67,7 @@ angular.module('IOne').controller('DeliveryOrderUpdateController', function ($ro
             {name: '物料名称', field: 'poDtl.product.name', enableCellEdit: false, width: 135},
             {name: '物料规格', field: 'poDtl.product.standard', enableCellEdit: false, width: 180},
             {
-                name: '原产地', field: 'sourceArea', width: 100, cellEditableCondition: function ($scope) {
+                name: '原产地', field: 'sourceArea', width: 130, cellEditableCondition: function ($scope) {
                     return $scope.col.grid.appScope.isEditable();
                 }, cellClass: 'editable-field'
             },
@@ -426,11 +426,19 @@ angular.module('IOne').controller('DeliveryOrderUpdateController', function ($ro
         });
 
         // aship 定制 原产地批次号制造日期默认值
-        if ($scope.currentDeliveryOrder.supplier.useBarcode == 'Y') {
         angular.forEach($scope.currentDeliveryOrderDetails, function (item) {
             if (!item.sourceArea) {
+                if ($scope.currentDeliveryOrder.supplier.useBarcode == 'Y') {
+                    item.sourceArea = "-";
+                } else {
+                    // 非防伪码供应商 + 物料flag判断
+                    if (item.poDtl.product.packFlag && item.poDtl.product.packFlag == 'Y') {
+                        item.sourceArea = item.poMst.purchaseOrderUid + "-" + item.poDtl.poDtlRow;
+                    } else {
                         item.sourceArea = "-";
                     }
+                }
+            }
             if (!item.manufacturingDate) {
                 item.manufacturingDate = new Date();
             }
@@ -438,7 +446,7 @@ angular.module('IOne').controller('DeliveryOrderUpdateController', function ($ro
                 item.batchId = $filter('date')(item.manufacturingDate, 'yyyyMMdd');
             }
         });
-        }
+
 
         //保存用户所选的采购类型、是否钢卷条件
         if ($rootScope.userInfo.suppliers.length > 0) {
@@ -508,9 +516,8 @@ angular.module('IOne').controller('DeliveryOrderUpdateController', function ($ro
     $scope.initAggregationGrid = function () {
         angular.forEach($scope.deliveryOrderAggregationGridOptions.data, function (item) {
             // aship 定制 单箱数量=送货数量
-            if ($scope.currentDeliveryOrder.supplier.useBarcode == 'Y') {
-                item.amountPerBox =item.totalAmount;
-            }
+            // if ($scope.currentDeliveryOrder.supplier.useBarcode == 'Y') {}
+            item.amountPerBox = item.totalAmount;
 
             item.getFullPackingBoxAmount = function () {
                 if (item.amountPerBox > 0 && item.totalAmount > 0) {
@@ -538,7 +545,7 @@ angular.module('IOne').controller('DeliveryOrderUpdateController', function ($ro
                 {name: '物料编号', field: 'product.productUid', enableCellEdit: false, width: 110},
                 {name: '物料名称', field: 'product.name', enableCellEdit: false, width: 150},
                 {name: '物料规格', field: 'product.standard', enableCellEdit: false, width: 200},
-                {name: '原产地', field: 'sourceArea', enableCellEdit: false, width: 100},
+                {name: '原产地', field: 'sourceArea', enableCellEdit: false, width: 130},
                 {name: '批次号', field: 'batchId', enableCellEdit: false, width: 100},
                 {name: '制造日期', field: 'manufacturingDate', enableCellEdit: false, cellFilter: 'date:"yyyy-MM-dd"', width: 100},
                 {name: '单位', field: 'unit', enableCellEdit: false, width: 100},
@@ -560,7 +567,7 @@ angular.module('IOne').controller('DeliveryOrderUpdateController', function ($ro
                 {name: '整包装箱数', field: 'getFullPackingBoxAmount()', enableCellEdit: false, width: 100},
                 {name: '零箱内数量', field: 'getAmountInLastBox()', enableCellEdit: false, width: 100},
                 {name: '包装类型', field: 'packingType', enableCellEdit: false, width: 100},
-                {name: '原产地', field: 'sourceArea', enableCellEdit: false, width: 100},
+                {name: '原产地', field: 'sourceArea', enableCellEdit: false, width: 130},
                 {name: '制造日期', field: 'manufacturingDate', enableCellEdit: false, cellFilter: 'date:"yyyy-MM-dd"', width: 100},
                 {name: '是否钢卷', field: 'getSteelCoil()', enableCellEdit: false, width: 100}
             ];
@@ -844,7 +851,7 @@ angular.module('IOne').controller('SteelCoilDlgCtrl', function ($scope, $uibModa
             {name: '规格', field: 'furnaceNo', enableCellEdit: true, width: 100, cellClass: 'editable-field'},
             {name: '数量', field: 'steelCoil', enableCellEdit: true, width: 100, cellClass: 'editable-field', type: 'number'},
             {name: '每卷重量', field: 'amountInCurrentBox', enableCellEdit: true, width: 100, cellClass: 'editable-field', type: 'number'},
-            {name: '原产地', field: 'doDtlProduct.sourceArea', enableCellEdit: false, width: 100},
+            {name: '原产地', field: 'doDtlProduct.sourceArea', enableCellEdit: false, width: 130},
             {name: '制造日期', field: 'doDtlProduct.manufacturingDate', enableCellEdit: false, width: 100, cellFilter: 'date:"yyyy-MM-dd"'},
             // { name:'制造日期', field: 'manufacturingDate', type: 'date', cellFilter: 'date:"yyyy-MM-dd"', enableCellEdit: true, width:150, cellClass: 'editable-field'},
 
@@ -942,7 +949,7 @@ angular.module('IOne').controller('NotSteelCoilDlgCtrl', function ($scope, $uibM
             {name: '模/穴号', field: 'mouldNo', width: 150, enableCellEdit: true, cellClass: 'editable-field'},
             {name: '净重', field: 'netWeight', width: 100, enableCellEdit: true, cellClass: 'editable-field'},
             {name: '毛重', field: 'grossWeight', width: 100, enableCellEdit: true, cellClass: 'editable-field'},
-            {name: '原产地', field: 'doDtlProduct.sourceArea', enableCellEdit: false, width: 100},
+            {name: '原产地', field: 'doDtlProduct.sourceArea', enableCellEdit: false, width: 130},
             {name: '制造日期', field: 'doDtlProduct.manufacturingDate', enableCellEdit: false, width: 100, cellFilter: 'date:"yyyy-MM-dd"'},
             // {name: '制造日期', field: 'manufacturingDate', type: 'date', cellFilter: 'date:"yyyy-MM-dd"', enableCellEdit: true, width: 150, cellClass: 'editable-field'},
             {

src/main/resources/static/app/srm/deliveryOrder/view/view.js

@@ -16,7 +16,7 @@
                 {name: '物料编号', field: 'poDtl.product.productUid', width: 110},
                 {name: '物料名称', field: 'poDtl.product.name', width: 150},
                 {name: '物料规格', field: 'poDtl.product.standard', width: 200},
-                {name: '原产地', field: 'sourceArea', width: 100},
+                {name: '原产地', field: 'sourceArea', width: 130},
                 {name: '批次号', field: 'batchId', width: 100},
                 {name: '制造日期', field: 'manufacturingDate', cellFilter: 'date:"yyyy-MM-dd"', width: 100},
                 {name: '单位', field: 'unit', enableCellEdit: false, width: 100},
@@ -153,7 +153,7 @@
                                 {name: '物料编号', field: 'product.productUid', enableCellEdit: false, width: 110},
                                 {name: '物料名称', field: 'product.name', enableCellEdit: false, width: 150},
                                 {name: '物料规格', field: 'product.standard', enableCellEdit: false, width: 200},
-                                {name: '原产地', field: 'sourceArea', enableCellEdit: false, width: 100},
+                                {name: '原产地', field: 'sourceArea', enableCellEdit: false, width: 130},
                                 {name: '批次号', field: 'batchId', enableCellEdit: false, width: 100},
                                 {name: '制造日期', field: 'manufacturingDate', enableCellEdit: false, width: 100, cellFilter: 'date:"yyyy-MM-dd"'},
                                 {name: '单位', field: 'unit', enableCellEdit: false, width: 100},
@@ -168,7 +168,7 @@
                                 {name: '物料编号', field: 'product.productUid', enableCellEdit: false, width: 110},
                                 {name: '物料名称', field: 'product.name', enableCellEdit: false, width: 150},
                                 {name: '物料规格', field: 'product.standard', enableCellEdit: false, width: 200},
-                                {name: '原产地', field: 'sourceArea', enableCellEdit: false, width: 100},
+                                {name: '原产地', field: 'sourceArea', enableCellEdit: false, width: 130},
                                 {name: '批次号', field: 'batchId', enableCellEdit: false, width: 100},
                                 {name: '制造日期', field: 'manufacturingDate', enableCellEdit: false, width: 100, cellFilter: 'date:"yyyy-MM-dd"'},
                                 {name: '单位', field: 'unit', enableCellEdit: false, width: 100},
@@ -215,7 +215,7 @@
                                 {name: '物料编号', field: 'doDtlProduct.product.productUid', width: 110, enableCellEdit: false},
                                 {name: '物料名称', field: 'doDtlProduct.product.name', width: 150, enableCellEdit: false},
                                 {name: '物料规格', field: 'doDtlProduct.product.standard', width: 200, enableCellEdit: false},
-                                {name: '原产地', field: 'doDtlProduct.sourceArea', width: 100, enableCellEdit: false},
+                                {name: '原产地', field: 'doDtlProduct.sourceArea', width: 130, enableCellEdit: false},
                                 {name: '批次号', field: 'doDtlProduct.batchId', width: 100, enableCellEdit: false},
                                 {name: '制造日期', field: 'doDtlProduct.manufacturingDate', width: 100, enableCellEdit: false, cellFilter: 'date:"yyyy-MM-dd"'},
                                 {name: '汇总项次', field: 'doDtlProductRow', width: 100, enableCellEdit: false},
@@ -233,7 +233,7 @@
                                 {name: '物料编号', field: 'doDtlProduct.product.productUid', width: 110, enableCellEdit: false},
                                 {name: '物料名称', field: 'doDtlProduct.product.name', width: 150, enableCellEdit: false},
                                 {name: '物料规格', field: 'doDtlProduct.product.standard', width: 200, enableCellEdit: false},
-                                {name: '原产地', field: 'doDtlProduct.sourceArea', width: 100, enableCellEdit: false},
+                                {name: '原产地', field: 'doDtlProduct.sourceArea', width: 130, enableCellEdit: false},
                                 {name: '批次号', field: 'doDtlProduct.batchId', width: 100, enableCellEdit: false},
                                 {name: '制造日期', field: 'doDtlProduct.manufacturingDate', width: 100, enableCellEdit: false, cellFilter: 'date:"yyyy-MM-dd"'},
                                 {name: '汇总项次', field: 'doDtlProductRow', width: 100, enableCellEdit: false},