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

xqs
2 parents ec38a780 f2049f44
Showing 3 changed files with 31 additions and 5 deletions
src/main/java/com/huaheng/pc/shipment/shipmentDetail/controller/ShipmentDetailController.java
src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java
src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
@@ -13,10 +13,12 @@ import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.framework.web.page.PageDomain;
 import com.huaheng.framework.web.page.TableDataInfo;
 import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.pc.config.shipmentPreference.service.ShipmentPreferenceService;
 import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
 import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
 import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetail;
 import com.huaheng.pc.shipment.shipmentDetail.service.ShipmentDetailService;
+import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -41,6 +43,8 @@ public class ShipmentDetailController extends BaseController
 	private ShipmentDetailService shipmentDetailService;
 	@Autowired
 	private InventoryDetailService inventoryDetailService;
+	@Autowired
+	private ShipmentPreferenceService shipmentPreferenceService;
@@ -162,4 +166,15 @@ public class ShipmentDetailController extends BaseController
+	@RequiresPermissions("shipment:bill:view")
+	@PostMapping( "/shippingCombination")
+	@ResponseBody
+	public AjaxResult ShippingCombination(String shipmentCode, ModelMap map){
+		map.put("code", shipmentCode);
+		Integer status = 100;
+		String ids="";
+		List<ShipmentHeader> shipmentHeaderList =shipmentPreferenceService.checkShipmentProcess(ids,status,shipmentCode);
+		return AjaxResult.success("成功");
+	}
+
 }
@@ -67,9 +67,6 @@ public class ShippingCombinationController extends BaseController {
     @GetMapping()
     public String ShippingCombination(String shipmentCode, ModelMap map){
         map.put("code", shipmentCode);
-        Integer status = 100;
-        String ids="";
-        List<ShipmentHeader> shipmentHeaderList =shipmentPreferenceService.checkShipmentProcess(ids,status,shipmentCode);
         return prefix+"/shippingCombination";
     }
@@ -695,8 +695,22 @@
             parent.$('.tabReload').click();
         }
         else{
-            createMenuItem(url, "出库组盘");
-            parent.$('.tabReload').click();
+            $.ajax({
+                url: ctx + "shipment/shipmentDetail/shippingCombination",
+                type: 'post',
+                data:{
+                    shipmentCode
+                },
+                success: function(res) {
+                    if (res.code === 200) {
+                        createMenuItem(url, "出库组盘");
+                        parent.$('.tabReload').click();
+                    }
+                    else {
+                        $.modal.msgError(res.msg)
+                    }
+                }
+            });
         }
     }
     /* 点击明细面板 */