wms / wms_wuhangelinmei · Commits

Commit aca6122c5c807025146b8d87d7c105b5d595ec0c

Authored by xqs
2 parents ec38a780 f2049f44

Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop

Inline Side-by-side
Showing 3 changed files with 31 additions and 5 deletions
src/main/java/com/huaheng/pc/shipment/shipmentDetail/controller/ShipmentDetailController.java
  View file @aca6122
... ... @@ -13,10 +13,12 @@ import com.huaheng.framework.web.domain.AjaxResult;
13 13 import com.huaheng.framework.web.page.PageDomain;
14 14 import com.huaheng.framework.web.page.TableDataInfo;
15 15 import com.huaheng.framework.web.page.TableSupport;
  16 +import com.huaheng.pc.config.shipmentPreference.service.ShipmentPreferenceService;
16 17 import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
17 18 import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
18 19 import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetail;
19 20 import com.huaheng.pc.shipment.shipmentDetail.service.ShipmentDetailService;
  21 +import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
20 22 import org.apache.shiro.authz.annotation.RequiresPermissions;
21 23 import org.springframework.beans.factory.annotation.Autowired;
22 24 import org.springframework.stereotype.Controller;
... ... @@ -41,6 +43,8 @@ public class ShipmentDetailController extends BaseController
41 43 private ShipmentDetailService shipmentDetailService;
42 44 @Autowired
43 45 private InventoryDetailService inventoryDetailService;
  46 + @Autowired
  47 + private ShipmentPreferenceService shipmentPreferenceService;
44 48  
45 49  
46 50  
... ... @@ -162,4 +166,15 @@ public class ShipmentDetailController extends BaseController
162 166  
163 167  
164 168  
  169 + @RequiresPermissions("shipment:bill:view")
  170 + @PostMapping( "/shippingCombination")
  171 + @ResponseBody
  172 + public AjaxResult ShippingCombination(String shipmentCode, ModelMap map){
  173 + map.put("code", shipmentCode);
  174 + Integer status = 100;
  175 + String ids="";
  176 + List<ShipmentHeader> shipmentHeaderList =shipmentPreferenceService.checkShipmentProcess(ids,status,shipmentCode);
  177 + return AjaxResult.success("成功");
  178 + }
  179 +
165 180 }
... ...
src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java
  View file @aca6122
... ... @@ -67,9 +67,6 @@ public class ShippingCombinationController extends BaseController {
67 67 @GetMapping()
68 68 public String ShippingCombination(String shipmentCode, ModelMap map){
69 69 map.put("code", shipmentCode);
70   - Integer status = 100;
71   - String ids="";
72   - List<ShipmentHeader> shipmentHeaderList =shipmentPreferenceService.checkShipmentProcess(ids,status,shipmentCode);
73 70 return prefix+"/shippingCombination";
74 71 }
75 72  
... ...
src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
  View file @aca6122
... ... @@ -695,8 +695,22 @@
695 695 parent.$('.tabReload').click();
696 696 }
697 697 else{
698   - createMenuItem(url, "出库组盘");
699   - parent.$('.tabReload').click();
  698 + $.ajax({
  699 + url: ctx + "shipment/shipmentDetail/shippingCombination",
  700 + type: 'post',
  701 + data:{
  702 + shipmentCode
  703 + },
  704 + success: function(res) {
  705 + if (res.code === 200) {
  706 + createMenuItem(url, "出库组盘");
  707 + parent.$('.tabReload').click();
  708 + }
  709 + else {
  710 + $.modal.msgError(res.msg)
  711 + }
  712 + }
  713 + });
700 714 }
701 715 }
702 716 /* 点击明细面板 */
... ...