From 5fa7d2f4b4ee9b78174c7acf812495eae2e9bd5b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 29 三月 2025 13:45:05 +0800
Subject: [PATCH] #新增 1. 新增组拖历史档 2. 收货添加生产日期
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinLog.java | 225 +++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/WaitPakinLogMapper.java | 12
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinItemController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakin.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/system/constant/SerialRuleCode.java | 6
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java | 74 ++++
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 21 +
rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java | 6
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinLogController.java | 110 ++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinItemLogController.java | 110 ++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaitPakinItemLogService.java | 8
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java | 4
rsf-server/src/main/resources/mapper/manager/WaitPakinItemLogMapper.xml | 5
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaitPakinLogService.java | 8
rsf-server/src/main/resources/mapper/manager/WaitPakinLogMapper.xml | 5
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItemLog.java | 313 ++++++++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java | 9
rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/WaitPakinItemLogMapper.java | 12
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinItemLogServiceImpl.java | 12
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinLogServiceImpl.java | 12
22 files changed, 940 insertions(+), 23 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java
index 67b0970..e5a383f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ReceiptDetlsDto.java
@@ -1,6 +1,7 @@
package com.vincent.rsf.server.api.entity.dto;
import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.vincent.rsf.server.api.controller.params.ReceiptParams;
import com.vincent.rsf.server.common.utils.CommonUtil;
import com.vincent.rsf.server.common.utils.FieldsUtils;
@@ -9,8 +10,10 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
+import java.util.Date;
import java.util.Map;
/**
@@ -52,12 +55,18 @@
@ApiModelProperty("璐ㄦ缁撴灉")
private String inspect;
+ @ApiModelProperty("閲嶉噺")
+ private Double weigth;
+
@ApiModelProperty("閲囪喘鍗曚綅")
private String purUnit;
@ApiModelProperty("搴撳瓨鍗曚綅")
private String stockUnit;
+ @ApiModelProperty("鏀惰揣鏃ユ湡")
+ private String prodTime;
+
@ApiModelProperty("閲囪喘鏁伴噺")
private Double purQty;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index 227029c..923f464 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -43,6 +43,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -166,12 +167,15 @@
throw new CoolException("搴撳尯鏍囪瘑涓嶈兘涓虹┖锛侊紒");
}
- WarehouseAreas areasItem = warehouseAreasService.getOne(new LambdaQueryWrapper<WarehouseAreas>().eq(WarehouseAreas::getId, params.getWhAreaId()));
+ WarehouseAreas areasItem = warehouseAreasService.getOne(new LambdaQueryWrapper<WarehouseAreas>()
+ .eq(WarehouseAreas::getId, params.getWhAreaId()));
if (Objects.isNull(areasItem)) {
throw new CoolException("鏁版嵁閿欒锛氬綋鍓嶅簱鍖轰笉瀛樺湪锛侊紒");
}
//鑾峰彇宸插惎鐢ㄧ殑鍔ㄦ�佹墿灞曞瓧
- List<Fields> fields = fieldsMapper.selectList(new LambdaQueryWrapper<Fields>().eq(Fields::getFlagEnable, 1).eq(Fields::getStatus, 1));
+ List<Fields> fields = fieldsMapper.selectList(new LambdaQueryWrapper<Fields>()
+ .eq(Fields::getFlagEnable, 1)
+ .eq(Fields::getStatus, 1));
List<ReceiptDetlsDto> receipts = params.getReceipts();
List<WarehouseAreasItem> allOrders = new ArrayList<>();
@@ -180,7 +184,8 @@
String asnCode = receipts.stream().findFirst().get().getAsnCode();
- AsnOrder asnOrder = asnOrderMapper.selectOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, asnCode));
+ AsnOrder asnOrder = asnOrderMapper.selectOne(new LambdaQueryWrapper<AsnOrder>()
+ .eq(AsnOrder::getCode, asnCode));
if (Objects.isNull(asnOrder)) {
throw new CoolException("鏁版嵁閿欒锛氫富鍗曚笉瀛樺湪锛侊紒");
}
@@ -208,16 +213,24 @@
if (Objects.isNull(orderItem)) {
throw new CoolException("閫氱煡鍗曟槑缁嗕笉瀛樺湪锛侊紒");
}
- orderItem.setQty(dto.getReceiptQty());
+ orderItem.setQty(dto.getReceiptQty())
+ .setProdTime(dto.getProdTime());
if (asnOrderItemMapper.updateById(orderItem) < 1) {
throw new CoolException("閫氱煡鍗曟槑缁嗘暟閲忎慨鏀瑰け璐ワ紒锛�");
}
WarehouseAreasItem item = new WarehouseAreasItem();
+// SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+// String format = null;
+// if (Objects.isNull(dto.getProdTime())) {
+// format = dateFormat.format(dto.getProdTime());
+// }
item.setBarcode(dto.getBarcode())
.setAreaName(areasItem.getName())
.setAreaId(areasItem.getId())
+ .setProdTime(dto.getProdTime())
+ .setWeight(dto.getWeigth())
.setStockUnit(dto.getStockUnit())
.setBatch(SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_RECEIPT_BATCH, dto))
.setAnfme(dto.getReceiptQty())
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
index 08b5f70..8e84939 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
@@ -22,8 +22,8 @@
// generator.username="sa";
// generator.password="Zoneyung@zy56$";
- generator.table="man_asn_order_log";
- generator.tableDesc="缁勬嫋妗ｆ槑缁�";
+ generator.table="man_wait_pakin_item_log";
+ generator.tableDesc="缁勬嫋鏄庣粏鍘嗗彶妗�";
generator.packagePath="com.vincent.rsf.server.manager";
generator.build();
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinItemController.java
index 00c2dc3..fef2580 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinItemController.java
@@ -12,6 +12,7 @@
import com.vincent.rsf.server.manager.entity.WaitPakinItem;
import com.vincent.rsf.server.manager.service.WaitPakinItemService;
import com.vincent.rsf.server.system.controller.BaseController;
+import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -19,6 +20,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;
+@Api(tags = "缁勬嫋妗ｆ槑缁�")
@RestController
public class WaitPakinItemController extends BaseController {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinItemLogController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinItemLogController.java
new file mode 100644
index 0000000..bda2e6e
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinItemLogController.java
@@ -0,0 +1,110 @@
+package com.vincent.rsf.server.manager.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.vincent.rsf.framework.common.Cools;
+import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.server.common.utils.ExcelUtil;
+import com.vincent.rsf.server.common.annotation.OperationLog;
+import com.vincent.rsf.server.common.domain.BaseParam;
+import com.vincent.rsf.server.common.domain.KeyValVo;
+import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.manager.entity.WaitPakinItemLog;
+import com.vincent.rsf.server.manager.service.WaitPakinItemLogService;
+import com.vincent.rsf.server.system.controller.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;
+
+@RestController
+public class WaitPakinItemLogController extends BaseController {
+
+ @Autowired
+ private WaitPakinItemLogService waitPakinItemLogService;
+
+ @PreAuthorize("hasAuthority('manager:waitPakinItemLog:list')")
+ @PostMapping("/waitPakinItemLog/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<WaitPakinItemLog, BaseParam> pageParam = new PageParam<>(baseParam, WaitPakinItemLog.class);
+ return R.ok().add(waitPakinItemLogService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('manager:waitPakinItemLog:list')")
+ @PostMapping("/waitPakinItemLog/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(waitPakinItemLogService.list());
+ }
+
+ @PreAuthorize("hasAuthority('manager:waitPakinItemLog:list')")
+ @PostMapping({"/waitPakinItemLog/many/{ids}", "/waitPakinItemLogs/many/{ids}"})
+ public R many(@PathVariable Long[] ids) {
+ return R.ok().add(waitPakinItemLogService.listByIds(Arrays.asList(ids)));
+ }
+
+ @PreAuthorize("hasAuthority('manager:waitPakinItemLog:list')")
+ @GetMapping("/waitPakinItemLog/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(waitPakinItemLogService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('manager:waitPakinItemLog:save')")
+ @OperationLog("Create 缁勬嫋鏄庣粏鍘嗗彶妗�")
+ @PostMapping("/waitPakinItemLog/save")
+ public R save(@RequestBody WaitPakinItemLog waitPakinItemLog) {
+ waitPakinItemLog.setCreateBy(getLoginUserId());
+ waitPakinItemLog.setCreateTime(new Date());
+ waitPakinItemLog.setUpdateBy(getLoginUserId());
+ waitPakinItemLog.setUpdateTime(new Date());
+ if (!waitPakinItemLogService.save(waitPakinItemLog)) {
+ return R.error("Save Fail");
+ }
+ return R.ok("Save Success").add(waitPakinItemLog);
+ }
+
+ @PreAuthorize("hasAuthority('manager:waitPakinItemLog:update')")
+ @OperationLog("Update 缁勬嫋鏄庣粏鍘嗗彶妗�")
+ @PostMapping("/waitPakinItemLog/update")
+ public R update(@RequestBody WaitPakinItemLog waitPakinItemLog) {
+ waitPakinItemLog.setUpdateBy(getLoginUserId());
+ waitPakinItemLog.setUpdateTime(new Date());
+ if (!waitPakinItemLogService.updateById(waitPakinItemLog)) {
+ return R.error("Update Fail");
+ }
+ return R.ok("Update Success").add(waitPakinItemLog);
+ }
+
+ @PreAuthorize("hasAuthority('manager:waitPakinItemLog:remove')")
+ @OperationLog("Delete 缁勬嫋鏄庣粏鍘嗗彶妗�")
+ @PostMapping("/waitPakinItemLog/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!waitPakinItemLogService.removeByIds(Arrays.asList(ids))) {
+ return R.error("Delete Fail");
+ }
+ return R.ok("Delete Success").add(ids);
+ }
+
+ @PreAuthorize("hasAuthority('manager:waitPakinItemLog:list')")
+ @PostMapping("/waitPakinItemLog/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<WaitPakinItemLog> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(WaitPakinItemLog::getId, condition);
+ }
+ waitPakinItemLogService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+ item -> vos.add(new KeyValVo(item.getId(), item.getId()))
+ );
+ return R.ok().add(vos);
+ }
+
+ @PreAuthorize("hasAuthority('manager:waitPakinItemLog:list')")
+ @PostMapping("/waitPakinItemLog/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(waitPakinItemLogService.list(), WaitPakinItemLog.class), response);
+ }
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinLogController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinLogController.java
new file mode 100644
index 0000000..29d85bd
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinLogController.java
@@ -0,0 +1,110 @@
+package com.vincent.rsf.server.manager.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.vincent.rsf.framework.common.Cools;
+import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.server.common.utils.ExcelUtil;
+import com.vincent.rsf.server.common.annotation.OperationLog;
+import com.vincent.rsf.server.common.domain.BaseParam;
+import com.vincent.rsf.server.common.domain.KeyValVo;
+import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.manager.entity.WaitPakinLog;
+import com.vincent.rsf.server.manager.service.WaitPakinLogService;
+import com.vincent.rsf.server.system.controller.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;
+
+@RestController
+public class WaitPakinLogController extends BaseController {
+
+ @Autowired
+ private WaitPakinLogService waitPakinLogService;
+
+ @PreAuthorize("hasAuthority('manager:waitPakinLog:list')")
+ @PostMapping("/waitPakinLog/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<WaitPakinLog, BaseParam> pageParam = new PageParam<>(baseParam, WaitPakinLog.class);
+ return R.ok().add(waitPakinLogService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('manager:waitPakinLog:list')")
+ @PostMapping("/waitPakinLog/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(waitPakinLogService.list());
+ }
+
+ @PreAuthorize("hasAuthority('manager:waitPakinLog:list')")
+ @PostMapping({"/waitPakinLog/many/{ids}", "/waitPakinLogs/many/{ids}"})
+ public R many(@PathVariable Long[] ids) {
+ return R.ok().add(waitPakinLogService.listByIds(Arrays.asList(ids)));
+ }
+
+ @PreAuthorize("hasAuthority('manager:waitPakinLog:list')")
+ @GetMapping("/waitPakinLog/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(waitPakinLogService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('manager:waitPakinLog:save')")
+ @OperationLog("Create 缁勬嫋鍘嗗彶妗�")
+ @PostMapping("/waitPakinLog/save")
+ public R save(@RequestBody WaitPakinLog waitPakinLog) {
+ waitPakinLog.setCreateBy(getLoginUserId());
+ waitPakinLog.setCreateTime(new Date());
+ waitPakinLog.setUpdateBy(getLoginUserId());
+ waitPakinLog.setUpdateTime(new Date());
+ if (!waitPakinLogService.save(waitPakinLog)) {
+ return R.error("Save Fail");
+ }
+ return R.ok("Save Success").add(waitPakinLog);
+ }
+
+ @PreAuthorize("hasAuthority('manager:waitPakinLog:update')")
+ @OperationLog("Update 缁勬嫋鍘嗗彶妗�")
+ @PostMapping("/waitPakinLog/update")
+ public R update(@RequestBody WaitPakinLog waitPakinLog) {
+ waitPakinLog.setUpdateBy(getLoginUserId());
+ waitPakinLog.setUpdateTime(new Date());
+ if (!waitPakinLogService.updateById(waitPakinLog)) {
+ return R.error("Update Fail");
+ }
+ return R.ok("Update Success").add(waitPakinLog);
+ }
+
+ @PreAuthorize("hasAuthority('manager:waitPakinLog:remove')")
+ @OperationLog("Delete 缁勬嫋鍘嗗彶妗�")
+ @PostMapping("/waitPakinLog/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!waitPakinLogService.removeByIds(Arrays.asList(ids))) {
+ return R.error("Delete Fail");
+ }
+ return R.ok("Delete Success").add(ids);
+ }
+
+ @PreAuthorize("hasAuthority('manager:waitPakinLog:list')")
+ @PostMapping("/waitPakinLog/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<WaitPakinLog> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(WaitPakinLog::getId, condition);
+ }
+ waitPakinLogService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+ item -> vos.add(new KeyValVo(item.getId(), item.getId()))
+ );
+ return R.ok().add(vos);
+ }
+
+ @PreAuthorize("hasAuthority('manager:waitPakinLog:list')")
+ @PostMapping("/waitPakinLog/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(waitPakinLogService.list(), WaitPakinLog.class), response);
+ }
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
index ff094e5..b9a8b68 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
@@ -137,6 +137,12 @@
private Double qty;
/**
+ * 鐢熶骇鏃ユ湡
+ */
+ @ApiModelProperty("鐢熶骇鏃ユ湡")
+ private String prodTime;
+
+ /**
* 渚涘簲鍟嗙紪鐮�
*/
@ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakin.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakin.java
index 3f82a58..d5ae471 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakin.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakin.java
@@ -71,7 +71,6 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItemLog.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItemLog.java
new file mode 100644
index 0000000..3a3cefe
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItemLog.java
@@ -0,0 +1,313 @@
+package com.vincent.rsf.server.manager.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.vincent.rsf.server.manager.service.MatnrService;
+import com.vincent.rsf.server.manager.service.WaitPakinService;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.vincent.rsf.framework.common.Cools;
+import com.vincent.rsf.framework.common.SpringUtils;
+import com.vincent.rsf.server.system.service.UserService;
+import com.vincent.rsf.server.system.entity.User;
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Accessors(chain = true)
+@TableName("man_wait_pakin_item_log")
+public class WaitPakinItemLog implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 涓诲崟ID
+ */
+ @ApiModelProperty(value= "涓诲崟ID")
+ private Long pakinId;
+
+ /**
+ * 鏄庣粏ID
+ */
+ @ApiModelProperty(value= "鏄庣粏ID")
+ private Long pakinItemId;
+
+ /**
+ * 璁㈠崟ID
+ */
+ @ApiModelProperty(value= "璁㈠崟ID")
+ private Long asnId;
+
+ /**
+ * 璁㈠崟鍙�
+ */
+ @ApiModelProperty(value= "璁㈠崟鍙�")
+ private String asnCode;
+
+ /**
+ * 鏄庣粏ID
+ */
+ @ApiModelProperty(value= "鏄庣粏ID")
+ private Long asnItemId;
+
+ /**
+ * 鐗╂枡璺熻釜鐮�
+ */
+ @ApiModelProperty(value= "鐗╂枡璺熻釜鐮�")
+ private String trackCode;
+
+ /**
+ * 鐗╂枡鍚嶇О
+ */
+ @ApiModelProperty(value= "鐗╂枡鍚嶇О")
+ private String maktx;
+
+ /**
+ * 鐗╂枡ID
+ */
+ @ApiModelProperty(value= "鐗╂枡ID")
+ private Long matnrId;
+
+ /**
+ * 鐗╂枡缂栫爜
+ */
+ @ApiModelProperty(value= "鐗╂枡缂栫爜")
+ private String matnrCode;
+
+ /**
+ * 鏁伴噺
+ */
+ @ApiModelProperty(value= "鏁伴噺")
+ private Double anfme;
+
+ /**
+ * 鎵ц涓暟閲�
+ */
+ @ApiModelProperty(value= "鎵ц涓暟閲�")
+ private Double workQty;
+
+ /**
+ * 鍗曚綅
+ */
+ @ApiModelProperty(value= "鍗曚綅")
+ private String unit;
+
+ /**
+ * 鎵╁睍瀛楁鏍囪瘑
+ */
+ @ApiModelProperty(value= "鎵╁睍瀛楁鏍囪瘑")
+ private String fieldsIndex;
+
+ /**
+ * 宸插畬鎴愭暟閲�
+ */
+ @ApiModelProperty(value= "宸插畬鎴愭暟閲�")
+ private Double qty;
+
+ /**
+ * 鎵规鍙�
+ */
+ @ApiModelProperty(value= "鎵规鍙�")
+ private String batch;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
+ private Integer status;
+
+ /**
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
+ private Integer deleted;
+
+ /**
+ * 绉熸埛
+ */
+ @ApiModelProperty(value= "绉熸埛")
+ private Integer tenantId;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ private Long createBy;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ private Long updateBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ public WaitPakinItemLog() {}
+
+ public WaitPakinItemLog(Long pakinId,Long pakinItemId,Long asnId,String asnCode,Long asnItemId,String trackCode,String maktx,Long matnrId,String matnrCode,Double anfme,Double workQty,String unit,String fieldsIndex,Double qty,String batch,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ this.pakinId = pakinId;
+ this.pakinItemId = pakinItemId;
+ this.asnId = asnId;
+ this.asnCode = asnCode;
+ this.asnItemId = asnItemId;
+ this.trackCode = trackCode;
+ this.maktx = maktx;
+ this.matnrId = matnrId;
+ this.matnrCode = matnrCode;
+ this.anfme = anfme;
+ this.workQty = workQty;
+ this.unit = unit;
+ this.fieldsIndex = fieldsIndex;
+ this.qty = qty;
+ this.batch = batch;
+ this.status = status;
+ this.deleted = deleted;
+ this.tenantId = tenantId;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ }
+
+// WaitPakinItemLog waitPakinItemLog = new WaitPakinItemLog(
+// null, // 涓诲崟ID
+// null, // 鏄庣粏ID
+// null, // 璁㈠崟ID
+// null, // 璁㈠崟鍙�
+// null, // 鏄庣粏ID
+// null, // 鐗╂枡璺熻釜鐮�
+// null, // 鐗╂枡鍚嶇О
+// null, // 鐗╂枡ID
+// null, // 鐗╂枡缂栫爜
+// null, // 鏁伴噺
+// null, // 鎵ц涓暟閲�
+// null, // 鍗曚綅
+// null, // 鎵╁睍瀛楁鏍囪瘑
+// null, // 宸插畬鎴愭暟閲�
+// null, // 鎵规鍙�
+// null, // 鐘舵�乕闈炵┖]
+// null, // 鏄惁鍒犻櫎[闈炵┖]
+// null, // 绉熸埛
+// null, // 娣诲姞浜哄憳
+// null, // 娣诲姞鏃堕棿[闈炵┖]
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿[闈炵┖]
+// null // 澶囨敞
+// );
+
+ public String getPakinId$(){
+ WaitPakinService service = SpringUtils.getBean(WaitPakinService.class);
+ WaitPakin waitPakin = service.getById(this.pakinId);
+ if (!Cools.isEmpty(waitPakin)){
+ return String.valueOf(waitPakin.getId());
+ }
+ return null;
+ }
+
+ public String getMatnrId$(){
+ MatnrService service = SpringUtils.getBean(MatnrService.class);
+ Matnr matnr = service.getById(this.matnrId);
+ if (!Cools.isEmpty(matnr)){
+ return String.valueOf(matnr.getUnit());
+ }
+ return null;
+ }
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "鍐荤粨";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+
+
+ public Boolean getStatusBool(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return true;
+ case 0:
+ return false;
+ default:
+ return null;
+ }
+ }
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinLog.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinLog.java
new file mode 100644
index 0000000..026c29a
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinLog.java
@@ -0,0 +1,225 @@
+package com.vincent.rsf.server.manager.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.vincent.rsf.framework.common.Cools;
+import com.vincent.rsf.framework.common.SpringUtils;
+import com.vincent.rsf.server.system.service.UserService;
+import com.vincent.rsf.server.system.entity.User;
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Accessors(chain = true)
+@TableName("man_wait_pakin_log")
+public class WaitPakinLog implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 涓诲崟ID
+ */
+ @ApiModelProperty(value= "涓诲崟ID")
+ private Long pakinId;
+
+ /**
+ * 缂栫爜
+ */
+ @ApiModelProperty(value= "缂栫爜")
+ private String code;
+
+ /**
+ * 瀹瑰櫒鐮�
+ */
+ @ApiModelProperty(value= "瀹瑰櫒鐮�")
+ private String barcode;
+
+ /**
+ * 缁勬嫋鏁伴噺
+ */
+ @ApiModelProperty(value= "缁勬嫋鏁伴噺")
+ private Double anfme;
+
+ /**
+ * 缁勬嫋鐘舵�� 0: 寰呭叆搴� 1: 鍏ュ簱涓�
+ */
+ @ApiModelProperty(value= "缁勬嫋鐘舵�� 0: 寰呭叆搴� 1: 鍏ュ簱涓� ")
+ private Short ioStatus;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
+ private Integer status;
+
+ /**
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
+ private Integer deleted;
+
+ /**
+ * 绉熸埛
+ */
+ @ApiModelProperty(value= "绉熸埛")
+ private Integer tenantId;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ private Long createBy;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ private Long updateBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ public WaitPakinLog() {}
+
+ public WaitPakinLog(Long pakinId,String code,String barcode,Double anfme,Short ioStatus,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ this.pakinId = pakinId;
+ this.code = code;
+ this.barcode = barcode;
+ this.anfme = anfme;
+ this.ioStatus = ioStatus;
+ this.status = status;
+ this.deleted = deleted;
+ this.tenantId = tenantId;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ }
+
+// WaitPakinLog waitPakinLog = new WaitPakinLog(
+// null, // 涓诲崟ID
+// null, // 缂栫爜
+// null, // 瀹瑰櫒鐮�
+// null, // 缁勬嫋鏁伴噺
+// null, // 缁勬嫋鐘舵�乕闈炵┖]
+// null, // 鐘舵�乕闈炵┖]
+// null, // 鏄惁鍒犻櫎[闈炵┖]
+// null, // 绉熸埛
+// null, // 娣诲姞浜哄憳
+// null, // 娣诲姞鏃堕棿[闈炵┖]
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿[闈炵┖]
+// null // 澶囨敞
+// );
+
+ public String getIoStatus$(){
+ if (null == this.ioStatus){ return null; }
+ switch (this.ioStatus){
+ case 0:
+ return "寰呭叆搴�";
+ case 1:
+ return " 鍏ュ簱涓�";
+ default:
+ return String.valueOf(this.ioStatus);
+ }
+ }
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "鍐荤粨";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+
+
+ public Boolean getStatusBool(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return true;
+ case 0:
+ return false;
+ default:
+ return null;
+ }
+ }
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/WaitPakinItemLogMapper.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/WaitPakinItemLogMapper.java
new file mode 100644
index 0000000..98c4b72
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/WaitPakinItemLogMapper.java
@@ -0,0 +1,12 @@
+package com.vincent.rsf.server.manager.mapper;
+
+import com.vincent.rsf.server.manager.entity.WaitPakinItemLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface WaitPakinItemLogMapper extends BaseMapper<WaitPakinItemLog> {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/WaitPakinLogMapper.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/WaitPakinLogMapper.java
new file mode 100644
index 0000000..2aa6fb2
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/WaitPakinLogMapper.java
@@ -0,0 +1,12 @@
+package com.vincent.rsf.server.manager.mapper;
+
+import com.vincent.rsf.server.manager.entity.WaitPakinLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface WaitPakinLogMapper extends BaseMapper<WaitPakinLog> {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
index a44caf1..3ea93c3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
@@ -10,6 +10,7 @@
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -20,6 +21,7 @@
import java.util.Date;
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
/**
* @author Ryan
@@ -47,6 +49,16 @@
@Resource
private SysStockProperties flowProperties;
+ @Autowired
+ private WaitPakinService waitPakinService;
+ @Autowired
+ private WaitPakinItemService waitPakinItemService;
+ @Autowired
+ private WaitPakinLogService waitPakinLogService;
+ @Autowired
+ private WaitPakinItemLogService waitPakinItemLogService;
+
+
/**
* @author Ryan
* @description 鏍规嵁PO鍗曟嵁鐢熸垚ASN鍗�,鑷姩鐢熸垚ASN鍗曚负鍏ㄩ噺鐢熸垚
@@ -55,7 +67,6 @@
* @time 2025/3/3 15:44
*/
@Scheduled(cron = "0 0/05 * * * ? ")
-// @Scheduled(cron = "0/5 * * * * ?")
@Transactional(rollbackFor = Exception.class)
public void genAsnOrder() {
//鍒ゆ柇鏄惁寮�鍚嚜鍔ㄧ敓鎴怉SN鍗曟嵁
@@ -131,13 +142,15 @@
if (!purchaseService.saveOrUpdate(purchase)) {
throw new CoolException("PO鍗曟墽琛屽畬鎴愬悗锛屼繚瀛樺け璐ワ紒锛�");
}
-
});
}
-
/**
- * 鐢熸垚鐗╂枡鏍囩
+ * @author Ryan
+ * @description 鐢熸垚鐗╂枡鏍囩
+ * @param
+ * @return
+ * @time 2025/3/29 12:35
*/
@Scheduled(cron = "0 0/05 * * * ? ")
@Transactional(rollbackFor = Exception.class)
@@ -163,4 +176,57 @@
}
}
+ /**
+ * @author Ryan
+ * @description 缁勬嫋鍘嗗彶妗�
+ * @param
+ * @return
+ * @time 2025/3/29 12:36
+ */
+ @Scheduled(cron = "0/5 * * * * ?")
+ @Transactional(rollbackFor = Exception.class)
+ public void pakinLog() {
+ List<WaitPakin> pakinIds = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getIoStatus, 2).select(WaitPakin::getId));
+ if (pakinIds.isEmpty()) {
+ return;
+ }
+ List<Long> list = pakinIds.stream().map(WaitPakin::getId).collect(Collectors.toList());
+ List<WaitPakin> pakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().in(WaitPakin::getId, list));
+ if (pakins.isEmpty()) {
+ throw new CoolException("缁勬嫋鍗曚负绌猴紒锛�");
+ }
+ List<WaitPakinLog> pakinLogs = new ArrayList<>();
+ pakins.forEach(pakin ->{
+ WaitPakinLog log = new WaitPakinLog();
+ BeanUtils.copyProperties(pakin, log);
+ log.setPakinId(pakin.getId()).setIoStatus(Short.parseShort("2"));
+ pakinLogs.add(log);
+ });
+ if (!waitPakinLogService.saveBatch(pakinLogs)) {
+ throw new CoolException("鍘嗗彶妗ｄ繚瀛樺け璐ワ紒锛�");
+ }
+ List<WaitPakinItemLog> itemLogs = new ArrayList<>();
+ List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().in(WaitPakinItem::getPakinId, list));
+ if (pakinItems.isEmpty()) {
+ throw new CoolException("缁勬嫋鏄庣粏涓虹┖锛侊紒");
+ }
+ pakinItems.forEach(item -> {
+ WaitPakinItemLog itemLog = new WaitPakinItemLog();
+ BeanUtils.copyProperties(item, itemLog);
+ itemLog.setPakinItemId(item.getId())
+ .setPakinId(item.getPakinId());
+ itemLogs.add(itemLog);
+ });
+
+ if (!waitPakinItemLogService.saveBatch(itemLogs)) {
+ throw new CoolException("鍘嗗彶鏄庣粏妗ｄ繚瀛樺け璐ワ紒锛�");
+ }
+ if (!waitPakinService.removeByIds(pakins)) {
+ throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
+ }
+ if (!waitPakinItemService.removeByIds(pakinItems)) {
+ throw new CoolException("鍘熷崟鎹槑缁嗗垹闄ゅけ璐ワ紒锛�");
+ }
+ }
+
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaitPakinItemLogService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaitPakinItemLogService.java
new file mode 100644
index 0000000..db4b00b
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaitPakinItemLogService.java
@@ -0,0 +1,8 @@
+package com.vincent.rsf.server.manager.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.vincent.rsf.server.manager.entity.WaitPakinItemLog;
+
+public interface WaitPakinItemLogService extends IService<WaitPakinItemLog> {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaitPakinLogService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaitPakinLogService.java
new file mode 100644
index 0000000..de9f250
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaitPakinLogService.java
@@ -0,0 +1,8 @@
+package com.vincent.rsf.server.manager.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.vincent.rsf.server.manager.entity.WaitPakinLog;
+
+public interface WaitPakinLogService extends IService<WaitPakinLog> {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
index 9d468c4..32a81f3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
@@ -108,10 +108,6 @@
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, asnOrderItem);
asnOrderItem.setTrackCode(ruleCode);
}
- if (StringUtils.isBlank(asnOrderItem.getBatch())) {
- String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_STOCK_BATCH_CODE, asnOrderItem);
- asnOrderItem.setBatch(ruleCode);
- }
if (!this.saveOrUpdate(asnOrderItem)) {
throw new CoolException("鏀惰揣閫氱煡鍗曟槑缁嗕繚瀛樺け璐ワ紒锛�");
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinItemLogServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinItemLogServiceImpl.java
new file mode 100644
index 0000000..5d980d0
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinItemLogServiceImpl.java
@@ -0,0 +1,12 @@
+package com.vincent.rsf.server.manager.service.impl;
+
+import com.vincent.rsf.server.manager.mapper.WaitPakinItemLogMapper;
+import com.vincent.rsf.server.manager.entity.WaitPakinItemLog;
+import com.vincent.rsf.server.manager.service.WaitPakinItemLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("waitPakinItemLogService")
+public class WaitPakinItemLogServiceImpl extends ServiceImpl<WaitPakinItemLogMapper, WaitPakinItemLog> implements WaitPakinItemLogService {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinLogServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinLogServiceImpl.java
new file mode 100644
index 0000000..2460a9f
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinLogServiceImpl.java
@@ -0,0 +1,12 @@
+package com.vincent.rsf.server.manager.service.impl;
+
+import com.vincent.rsf.server.manager.mapper.WaitPakinLogMapper;
+import com.vincent.rsf.server.manager.entity.WaitPakinLog;
+import com.vincent.rsf.server.manager.service.WaitPakinLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("waitPakinLogService")
+public class WaitPakinLogServiceImpl extends ServiceImpl<WaitPakinLogMapper, WaitPakinLog> implements WaitPakinLogService {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
index adedc2c..e0e0b76 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
@@ -61,8 +61,9 @@
if (StringUtils.isBlank(ruleCode)) {
throw new CoolException("缂栫爜瑙勫垯閿欒锛� 缂栫爜瑙勫垯銆孲YS_WAIT_PAKIN_CODE銆嶈鍒欐槸涓嶅瓨鍦�");
}
-
pakin.setCode(ruleCode)
+ //鐘舵�佷慨鏀逛负鍏ュ簱涓�
+ .setIoStatus(Short.parseShort("1"))
.setAnfme(sum)
.setBarcode(waitPakin.getBarcode());
if (!this.save(pakin)) {
@@ -89,7 +90,6 @@
.setMatnrCode(item.getMatnrCode())
.setBatch(item.getSplrBatch())
.setUnit(item.getStockUnit())
- .setBatch(item.getSplrBatch())
.setFieldsIndex(item.getFieldsIndex())
.setUnit(item.getStockUnit())
.setMatnrId(StringUtils.isNotBlank(item.getMatnrId()) ? Long.parseLong(item.getMatnrId()) : null)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/SerialRuleCode.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/SerialRuleCode.java
index 12e3852..4e1985d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/SerialRuleCode.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/SerialRuleCode.java
@@ -43,10 +43,4 @@
* 缁勬嫋缂栫爜鐢熸垚瑙勫垯
*/
public final static String SYS_WAIT_PAKIN_CODE = "sys_wait_pakin_code";
-
- /**
- * 搴撳瓨鎵规缂栫爜瑙勫垯
- */
- public final static String SYS_STOCK_BATCH_CODE = "sys_stock_batch_code";
-
}
diff --git a/rsf-server/src/main/resources/mapper/manager/WaitPakinItemLogMapper.xml b/rsf-server/src/main/resources/mapper/manager/WaitPakinItemLogMapper.xml
new file mode 100644
index 0000000..a260a58
--- /dev/null
+++ b/rsf-server/src/main/resources/mapper/manager/WaitPakinItemLogMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.vincent.rsf.server.manager.mapper.WaitPakinItemLogMapper">
+
+</mapper>
diff --git a/rsf-server/src/main/resources/mapper/manager/WaitPakinLogMapper.xml b/rsf-server/src/main/resources/mapper/manager/WaitPakinLogMapper.xml
new file mode 100644
index 0000000..5ad7af6
--- /dev/null
+++ b/rsf-server/src/main/resources/mapper/manager/WaitPakinLogMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.vincent.rsf.server.manager.mapper.WaitPakinLogMapper">
+
+</mapper>
--
Gitblit v1.9.1