开始波次

pengcheng
1 parent 5e71560a
Showing 2 changed files with 90 additions and 45 deletions
src/main/java/com/huaheng/pc/shipment/wave/controller/WaveController.java
src/main/resources/templates/shipment/wave/wave.html
@@ -15,6 +15,8 @@ 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.shipment.shipmentDetail.domain.ShipmentDetail;
+import com.huaheng.pc.shipment.shipmentDetail.service.ShipmentDetailService;
 import com.huaheng.pc.shipment.wave.domain.Wave;
 import com.huaheng.pc.shipment.wave.service.WaveService;
 import io.swagger.annotations.Api;
@@ -43,6 +45,8 @@ public class WaveController extends BaseController {
     @Autowired
     private WaveService waveService;
+    @Autowired
+    private ShipmentDetailService shipmentDetailService;
     @RequiresPermissions("shipment:wave:view")
     @GetMapping()
@@ -86,48 +90,48 @@ public class WaveController extends BaseController {
         }
     }
-    /**
-     * 新增波次
-     */
-    @GetMapping("/add")
-    public String add() {
-        return prefix + "/add";
-    }
-
-    /**
-     * 新增波次
-     */
-    @RequiresPermissions("shipment:wave:add")
-    @Log(title = "出库-波次", operating = "新增波次", action = BusinessType.INSERT)
-    @PostMapping("/add")
-    @ResponseBody
-    public AjaxResult addSave(Wave wave){
-        wave.setWarehouseCode(ShiroUtils.getWarehouseCode());
-        wave.setCreatedBy(ShiroUtils.getLoginName());
-        wave.setLastUpdatedBy(ShiroUtils.getLoginName());
-        return toAjax(waveService.save(wave));
-    }
-
-    /**
-     * 修改波次
-     */
-    @GetMapping("/edit/{id}")
-    public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
-        mmap.put("wave", waveService.getById(id));
-        return prefix + "/edit";
-    }
-
-    /**
-     * 修改波次
-     */
-    @RequiresPermissions("shipment:wave:edit")
-    @Log(title = "出库-波次", operating = "修改波次", action = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    @ResponseBody
-    public AjaxResult editSave(Wave wave) {
-        wave.setLastUpdatedBy(ShiroUtils.getLoginName());
-        return toAjax(waveService.updateById(wave));
-    }
+//    /**
+//     * 新增波次
+//     */
+//    @GetMapping("/add")
+//    public String add() {
+//        return prefix + "/add";
+//    }
+//
+//    /**
+//     * 新增波次
+//     */
+//    @RequiresPermissions("shipment:wave:add")
+//    @Log(title = "出库-波次", operating = "新增波次", action = BusinessType.INSERT)
+//    @PostMapping("/add")
+//    @ResponseBody
+//    public AjaxResult addSave(Wave wave){
+//        wave.setWarehouseCode(ShiroUtils.getWarehouseCode());
+//        wave.setCreatedBy(ShiroUtils.getLoginName());
+//        wave.setLastUpdatedBy(ShiroUtils.getLoginName());
+//        return toAjax(waveService.save(wave));
+//    }
+
+//    /**
+//     * 修改波次
+//     */
+//    @GetMapping("/edit/{id}")
+//    public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
+//        mmap.put("wave", waveService.getById(id));
+//        return prefix + "/edit";
+//    }
+//
+//    /**
+//     * 修改波次
+//     */
+//    @RequiresPermissions("shipment:wave:edit")
+//    @Log(title = "出库-波次", operating = "修改波次", action = BusinessType.UPDATE)
+//    @PostMapping("/edit")
+//    @ResponseBody
+//    public AjaxResult editSave(Wave wave) {
+//        wave.setLastUpdatedBy(ShiroUtils.getLoginName());
+//        return toAjax(waveService.updateById(wave));
+//    }
     /**
      * 删除波次
@@ -142,10 +146,28 @@ public class WaveController extends BaseController {
         }
         List<Integer> list = new ArrayList<>();
         for (Integer id : Convert.toIntArray(ids)) {
+            LambdaQueryWrapper<ShipmentDetail> lam=Wrappers.lambdaQuery();
+            lam.eq(ShipmentDetail::getWarehouseCode,ShiroUtils.getWarehouseCode())
+                    .eq(ShipmentDetail::getWaveId,id);
+            List<ShipmentDetail> shipmentDetails=shipmentDetailService.list(lam);
+            if(shipmentDetails !=null || shipmentDetails.size()>0){
+                return AjaxResult.error("id为"+ id +"的波次不能删除，有单据处于此波次中");
+            }
             list.add(id);
         }
         return toAjax(waveService.removeByIds(list));
     }
+    /**
+    * 开始波次
+   */
+    @RequiresPermissions("shipment:wave:startWave")
+    @Log(title = "出库-波次", operating = "开始波次", action = BusinessType.UPDATE)
+    @PostMapping("/startWave")
+    @ResponseBody
+    public AjaxResult editSave(Wave wave) {
+        wave.setLastUpdatedBy(ShiroUtils.getLoginName());
+        return toAjax(waveService.updateById(wave));
+    }
 }
@@ -30,8 +30,14 @@
             </form>
         </div>
         <div class="btn-group hidden-xs" id="toolbar" role="group">
-            <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="shipment:wave:add">
-                <i class="fa fa-plus"></i> 新增
+            <!--<a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="shipment:wave:add">-->
+                <!--<i class="fa fa-plus"></i> 新增-->
+            <!--</a>-->
+            <a class="btn btn-outline btn-success btn-rounded" onclick="startWave()" shiro:hasPermission="shipment:wave:startWave">
+            <i class="fa fa-plus"></i> 开始波次
+            </a>
+            <a class="btn btn-outline btn-success btn-rounded" onclick="freed()" shiro:hasPermission="shipment:wave:freed">
+            <i class="fa fa-plus"></i> 释放
             </a>
             <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="shipment:wave:remove">
                 <i class="fa fa-trash-o"></i> 删除
@@ -200,7 +206,7 @@
                             align: 'center',
                             formatter: function(value, row, index) {
                                 var actions = [];
-                                actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')" ><i class="fa fa-edit"></i>编辑</a> ');
+                                // actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')" ><i class="fa fa-edit"></i>编辑</a> ');
                                 actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')" ><i class="fa fa-trash-o"></i>删除</a>');
                                 return actions.join('');
                             }
@@ -208,6 +214,23 @@
                 };
                 $.table.init(options);
             });
+
+
+            //开始波次
+            function startWave() {
+                var rows = $("#bootstrap-table").bootstrapTable('getSelections');
+                if (rows.length == 0) {
+                    $.modal.alertWarning("请至少选择一条记录");
+                    return;
+                }
+                var url = prefix + "/startWave";
+                var data = {
+                    "ids": rows.map(function (v) {
+                        return v.id;
+                    }).join(',')
+                };
+                localSubmit(url, "post", "json", data);
+            }
         </script>
 </body>
 </html>
 \ No newline at end of file