wms / wms_tianjinggelinmei · Commits

Commit d7290670798bab7723988196a22ef1c3c0c2adb0

Authored by mahuandong
2 parents 92b5a4af b277d411

Merge remote-tracking branch 'origin/develop' into develop

Inline Side-by-side
Showing 4 changed files with 13 additions and 10 deletions
src/main/java/com/huaheng/pc/config/shipmentPreference/controller/ShipmentPreferenceController.java
  View file @d729067
... ... @@ -77,7 +77,7 @@ public class ShipmentPreferenceController extends BaseController {
77 77 }
78 78  
79 79 /**
80   - * 新增入库首选项
  80 + * 新增出库首选项
81 81 */
82 82 @GetMapping("/add")
83 83 public String add() {
... ...
src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java
  View file @d729067
... ... @@ -143,6 +143,9 @@ public class ShippingCombinationController extends BaseController {
143 143 if(list.isEmpty()){
144 144 throw new ServiceException("该物料没有库存或没有符合出库规则的库存");
145 145 }
  146 + for(InventoryDetail item : list){
  147 + item.setQty(item.getQty().subtract(item.getTaskQty()));
  148 + }
146 149 //查找分配规则
147 150 return getDataTable(list);
148 151 }
... ... @@ -156,7 +159,7 @@ public class ShippingCombinationController extends BaseController {
156 159 @RequiresPermissions("shipment:shippingCombination:combination")
157 160 @PostMapping("/Addcombination")
158 161 @ResponseBody
159   - public AjaxResult Addcombination(ShipmentCombinationModel shipmentCombinationModel){
  162 + public AjaxResult Addcombination(ShipmentCombinationModel shipmentCombinationModel){
160 163 ShipmentContainerHeader shipmentContainerHeader= shipmentContainerHeaderService.combination(shipmentCombinationModel);
161 164 return AjaxResult.success(shipmentContainerHeader.getId());
162 165 }
... ...
src/main/resources/templates/config/configValue/configValue.html
  View file @d729067
... ... @@ -31,10 +31,10 @@
31 31 </form>
32 32 </div>
33 33 <div class="btn-group hidden-xs" id="toolbar" role="group">
34   - <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="config:company:add">
  34 + <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="config:configValue:add">
35 35 <i class="fa fa-plus"></i> 新增
36 36 </a>
37   - <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="config:company:remove">
  37 + <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="config:configValue:remove">
38 38 <i class="fa fa-trash-o"></i> 删除
39 39 </a>
40 40 </div>
... ... @@ -95,10 +95,10 @@
95 95 field : 'description',
96 96 title : '描述'
97 97 },
98   - {
99   - field : 'systemCreated',
100   - title : '系统创建'
101   - },
  98 + // {
  99 + // field : 'systemCreated',
  100 + // title : '系统创建'
  101 + // },
102 102 {
103 103 field : 'created',
104 104 title : '创建时间'
... ...
src/main/resources/templates/config/shipmentPreference/shipmentPreference.html
  View file @d729067
... ... @@ -54,7 +54,7 @@
54 54 var prefix = ctx + "config/shipmentPreference";
55 55 var StatusFlow = [[${@StatusFlow.shipmentStatusFlowHeaders('shipment')}]];
56 56 var shipmentPickingRule = [[${@filterConfigHeaderService.getFilterConfigHeaderService('shipment','shipmentPickingRule')}]];
57   - var allocationRule = [[${@filterConfigHeaderService.getFilterConfigHeaderService('shipment','allocationRule')}]];
  57 + var allocationRules = [[${@filterConfigHeaderService.getFilterConfigHeaderService('shipment','allocationRule')}]];
58 58 $(function() {
59 59 var options = {
60 60 url: prefix + "/list",
... ... @@ -102,7 +102,7 @@
102 102 title : '库存分配规则',
103 103 formatter: function (value, item, index) {
104 104 var actions = [];
105   - $.each(allocationRule, function(index, dict) {
  105 + $.each(allocationRules, function(index, dict) {
106 106 if (dict.filterCode == value) {
107 107 actions.push("<span class='badge badge-" + dict.filterCode + "'>" + dict.filterName + "</span>");
108 108 return false;
... ...