Merge remote-tracking branch 'origin/master'

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/SaveSubOrderVo.java

@@ -1,10 +1,16 @@
 package org.springblade.desk.produce.pojo.vo;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import java.util.Date;
 
 @Data
 public class SaveSubOrderVo {
     private Long wpId;
     private Long shId;
     private Long cslId;
+    @Schema(description = "质量编号")
+    private String qualityNumber;
+    @Schema(description = "到期日期")
+    private Date dueDate;
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PlateAroundController.java

@@ -16,10 +16,8 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.produce.pojo.dto.PlateAroundDto;
-import org.springblade.desk.produce.pojo.dto.SavePlateAroundDto;
 import org.springblade.desk.produce.pojo.entity.HandoverRecord;
 import org.springblade.desk.produce.pojo.entity.PlateAround;
-import org.springblade.desk.produce.pojo.entity.WorkPlan;
 import org.springblade.desk.produce.pojo.vo.AfterPlateInVO;
 import org.springblade.desk.produce.pojo.vo.BeforePlatInVO;
 import org.springblade.desk.produce.pojo.vo.PlateAroundVO;
@@ -27,10 +25,8 @@ import org.springblade.desk.produce.pojo.vo.PrintWarehousingVO;
 import org.springblade.desk.produce.service.IHandoverRecordService;
 import org.springblade.desk.produce.service.IPlateAroundService;
 import org.springblade.desk.produce.wrapper.HandoverRecordWrapper;
-import org.springblade.job.pojo.entity.JobInfo;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -82,7 +78,7 @@ public class PlateAroundController extends BladeController {
 
     @PostMapping(value = "/deleteById")
     @ApiOperationSupport(order = 5)
-    @Operation(summary = "删除镀后入库", description = "")
+    @Operation(summary = "删除镀后入库")
     public R deleteById(@RequestParam Long id) {
         return R.data(plateAroundService.deletePlateAround(id));
     }
@@ -96,7 +92,7 @@ public class PlateAroundController extends BladeController {
 
     @PostMapping(value = "/savePlateFrontEnter")
     @ApiOperationSupport(order = 7)
-    @Operation(summary = "保存镀前入库", description = "")
+    @Operation(summary = "保存镀前入库")
     public R savePlateFrontEnter(@RequestBody List<PlateAround> plateArounds) {
         plateAroundService.savePlateFrontEnter(plateArounds, PlateAround.BEFORE_PLAT_IN);
         return R.success();
@@ -104,7 +100,7 @@ public class PlateAroundController extends BladeController {
 
     @PostMapping(value = "/savePlateFrontIssue")
     @ApiOperationSupport(order = 8)
-    @Operation(summary = "保存镀前出库", description = "")
+    @Operation(summary = "保存镀前出库")
     public R savePlateFrontIssue(@RequestBody List<PlateAround> plateArounds) {
         plateAroundService.savePlateFrontEnter(plateArounds, PlateAround.BEFORE_PLAN_OUT);
         return R.success();
@@ -112,7 +108,7 @@ public class PlateAroundController extends BladeController {
 
     @PostMapping(value = "/savePlateAfterEnter")
     @ApiOperationSupport(order = 9)
-    @Operation(summary = "保存镀后入库", description = "")
+    @Operation(summary = "保存镀后入库")
     public R savePlateAfterEnter(@RequestBody List<PlateAround> plateArounds) {
         plateAroundService.savePlateFrontEnter(plateArounds, PlateAround.AFTER_PLAN_IN);
         return R.success();
@@ -120,14 +116,14 @@ public class PlateAroundController extends BladeController {
 
     @PostMapping(value = "/getByPartCode")
     @ApiOperationSupport(order = 10)
-    @Operation(summary = "获取零件信息", description = "")
+    @Operation(summary = "获取零件信息")
     public R getByPartCode(@RequestParam String partCode) {
         return R.data(plateAroundService.getByPartCode(partCode));
     }
 
     @GetMapping("/queryNewRecord")
     @ApiOperationSupport(order = 11)
-    @Operation(summary = "入库单列表", description = "")
+    @Operation(summary = "入库单列表")
     public R<IPage<HandoverRecord>> queryNewRecord(HandoverRecord handoverRecord, Query query) {
         LambdaQueryWrapper<HandoverRecord> wrapper = Wrappers.lambdaQuery(handoverRecord);
         if (CommonUtil.isAllFieldsEmpty(handoverRecord)) {
@@ -140,7 +136,7 @@ public class PlateAroundController extends BladeController {
 
     @PostMapping(value = "/handoverRecordPrint")
     @ApiOperationSupport(order = 12)
-    @Operation(summary = "入库单打印", description = "")
+    @Operation(summary = "入库单打印")
     public R<List<PrintWarehousingVO>> handoverRecordPrint(@RequestParam String hrIds) {
         return R.data(handoverRecordService.handoverRecordPrint(Func.toLongList(hrIds)));
     }

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaSaveServiceImpl.java

@@ -1122,7 +1122,7 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
         Date nowDate = new Date();
         try {
             //进行入库
-            wmsTaskClient.saveSubOrderWarehousing(yo.getPartCode(), wo.getBatchNo(), wo.getMakeQty(), shId, cslId, nowDate, AuthUtil.getUserId());
+            wmsTaskClient.saveSubOrderWarehousing(wo.getWoCode(), yo.getPartCode(), wo.getBatchNo(), wo.getMakeQty(), shId, cslId, nowDate, AuthUtil.getUserId(), subOrder.getQualityNumber(), yo.getProductIdent(), subOrder.getDueDate());
         } catch (Exception e) {
             log.error("子件入库调用失败：{}", e.getMessage());
         }