手动装箱更新 默认显示当天

ym-packing/src/main/java/com/cnbm/packing/controller/ChangePackagingBoxHistoryController.java

@@ -11,6 +11,7 @@ import com.cnbm.common.validator.group.AddGroup;
 import com.cnbm.common.validator.group.DefaultGroup;
 import com.cnbm.common.validator.group.UpdateGroup;
 import com.cnbm.packing.dto.ChangePackagingBoxHistoryDTO;
+import com.cnbm.packing.entity.ChangePackagingBoxHistory;
 import com.cnbm.packing.excel.ChangePackagingBoxHistoryExcel;
 import com.cnbm.packing.service.ChangePackagingBoxHistoryServiceBiz;
 import io.swagger.annotations.Api;
@@ -117,7 +118,7 @@ public class ChangePackagingBoxHistoryController {
     })
     @PreAuthorize("@ex.hasAuthority('packing:changePackagingBoxHistory:export')")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<ChangePackagingBoxHistoryDTO> list = changePackagingBoxHistoryService.list(params);
+        List<ChangePackagingBoxHistory> list = changePackagingBoxHistoryService.historyList(params);
         if(list.size()>0) {
             ExcelUtils.exportExcelToTarget(response, "包装箱模组操作记录", list, ChangePackagingBoxHistoryExcel.class);
         }

ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxController.java

@@ -159,4 +159,13 @@ public class WoPackagingBoxController {
         return woPackagingBoxService.boxList(woSubstrateId);
     }
 
+    @PostMapping("insertSubstrateManual")
+    @ApiOperation("手动新增包装箱")
+    @LogOperation("手动新增包装箱")
+    public IdVo insertSubstrateManual(@RequestBody WoPackagingBoxDTO dto){
+
+        return woPackagingBoxService.insertSubstrateManual(dto);
+
+    }
+
 }

ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java

@@ -277,4 +277,14 @@ public class WoPackagingBoxSubstrateController {
         return new Result();
     }
 
+    @PostMapping("updateSubstrateManual")
+    @ApiOperation("手动装箱编辑")
+    @LogOperation("手动装箱编辑")
+    public Result updateSubstrateManual(@RequestBody ChangePackingBoxDTO[] dtos){
+
+        woPackagingBoxSubstrateService.updateSubstrateManual(dtos);
+
+        return new Result();
+    }
+
 }