From ba8fe5adc13fc5a7fa87f4ef76cb7b3c6b765e91 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 27 三月 2025 15:44:31 +0800
Subject: [PATCH] #新增 1. 新增组拖工作档 2. 新增组拖工作档明细
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java | 110 +++++++
rsf-server/src/main/resources/mapper/manager/WaitPakinMapper.xml | 5
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinItemController.java | 110 +++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakin.java | 230 ++++++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java | 12
rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/WaitPakinItemMapper.java | 12
rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java | 4
rsf-server/src/main/java/waitPakinItem.sql | 31 ++
rsf-server/src/main/resources/mapper/manager/WaitPakinItemMapper.xml | 5
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinItemServiceImpl.java | 12
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaitPakinItemService.java | 8
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaitPakinService.java | 8
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java | 250 +++++++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/WaitPakinMapper.java | 12
14 files changed, 807 insertions(+), 2 deletions(-)
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 21b8076..da01e74 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_device_site";
- generator.tableDesc="device sites";
+ generator.table="man_wait_pakin_item";
+ 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/WaitPakinController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
new file mode 100644
index 0000000..8fd8b82
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.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.WaitPakin;
+import com.vincent.rsf.server.manager.service.WaitPakinService;
+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 WaitPakinController extends BaseController {
+
+ @Autowired
+ private WaitPakinService waitPakinService;
+
+ @PreAuthorize("hasAuthority('manager:waitPakin:list')")
+ @PostMapping("/waitPakin/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<WaitPakin, BaseParam> pageParam = new PageParam<>(baseParam, WaitPakin.class);
+ return R.ok().add(waitPakinService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('manager:waitPakin:list')")
+ @PostMapping("/waitPakin/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(waitPakinService.list());
+ }
+
+ @PreAuthorize("hasAuthority('manager:waitPakin:list')")
+ @PostMapping({"/waitPakin/many/{ids}", "/waitPakins/many/{ids}"})
+ public R many(@PathVariable Long[] ids) {
+ return R.ok().add(waitPakinService.listByIds(Arrays.asList(ids)));
+ }
+
+ @PreAuthorize("hasAuthority('manager:waitPakin:list')")
+ @GetMapping("/waitPakin/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(waitPakinService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('manager:waitPakin:save')")
+ @OperationLog("Create 缁勬嫋妗�")
+ @PostMapping("/waitPakin/save")
+ public R save(@RequestBody WaitPakin waitPakin) {
+ waitPakin.setCreateBy(getLoginUserId());
+ waitPakin.setCreateTime(new Date());
+ waitPakin.setUpdateBy(getLoginUserId());
+ waitPakin.setUpdateTime(new Date());
+ if (!waitPakinService.save(waitPakin)) {
+ return R.error("Save Fail");
+ }
+ return R.ok("Save Success").add(waitPakin);
+ }
+
+ @PreAuthorize("hasAuthority('manager:waitPakin:update')")
+ @OperationLog("Update 缁勬嫋妗�")
+ @PostMapping("/waitPakin/update")
+ public R update(@RequestBody WaitPakin waitPakin) {
+ waitPakin.setUpdateBy(getLoginUserId());
+ waitPakin.setUpdateTime(new Date());
+ if (!waitPakinService.updateById(waitPakin)) {
+ return R.error("Update Fail");
+ }
+ return R.ok("Update Success").add(waitPakin);
+ }
+
+ @PreAuthorize("hasAuthority('manager:waitPakin:remove')")
+ @OperationLog("Delete 缁勬嫋妗�")
+ @PostMapping("/waitPakin/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!waitPakinService.removeByIds(Arrays.asList(ids))) {
+ return R.error("Delete Fail");
+ }
+ return R.ok("Delete Success").add(ids);
+ }
+
+ @PreAuthorize("hasAuthority('manager:waitPakin:list')")
+ @PostMapping("/waitPakin/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<WaitPakin> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(WaitPakin::getId, condition);
+ }
+ waitPakinService.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:waitPakin:list')")
+ @PostMapping("/waitPakin/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(waitPakinService.list(), WaitPakin.class), response);
+ }
+
+}
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
new file mode 100644
index 0000000..00c2dc3
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinItemController.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.WaitPakinItem;
+import com.vincent.rsf.server.manager.service.WaitPakinItemService;
+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 WaitPakinItemController extends BaseController {
+
+ @Autowired
+ private WaitPakinItemService waitPakinItemService;
+
+ @PreAuthorize("hasAuthority('manager:waitPakinItem:list')")
+ @PostMapping("/waitPakinItem/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<WaitPakinItem, BaseParam> pageParam = new PageParam<>(baseParam, WaitPakinItem.class);
+ return R.ok().add(waitPakinItemService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('manager:waitPakinItem:list')")
+ @PostMapping("/waitPakinItem/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(waitPakinItemService.list());
+ }
+
+ @PreAuthorize("hasAuthority('manager:waitPakinItem:list')")
+ @PostMapping({"/waitPakinItem/many/{ids}", "/waitPakinItems/many/{ids}"})
+ public R many(@PathVariable Long[] ids) {
+ return R.ok().add(waitPakinItemService.listByIds(Arrays.asList(ids)));
+ }
+
+ @PreAuthorize("hasAuthority('manager:waitPakinItem:list')")
+ @GetMapping("/waitPakinItem/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(waitPakinItemService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('manager:waitPakinItem:save')")
+ @OperationLog("Create 缁勬嫋妗ｆ槑缁�")
+ @PostMapping("/waitPakinItem/save")
+ public R save(@RequestBody WaitPakinItem waitPakinItem) {
+ waitPakinItem.setCreateBy(getLoginUserId());
+ waitPakinItem.setCreateTime(new Date());
+ waitPakinItem.setUpdateBy(getLoginUserId());
+ waitPakinItem.setUpdateTime(new Date());
+ if (!waitPakinItemService.save(waitPakinItem)) {
+ return R.error("Save Fail");
+ }
+ return R.ok("Save Success").add(waitPakinItem);
+ }
+
+ @PreAuthorize("hasAuthority('manager:waitPakinItem:update')")
+ @OperationLog("Update 缁勬嫋妗ｆ槑缁�")
+ @PostMapping("/waitPakinItem/update")
+ public R update(@RequestBody WaitPakinItem waitPakinItem) {
+ waitPakinItem.setUpdateBy(getLoginUserId());
+ waitPakinItem.setUpdateTime(new Date());
+ if (!waitPakinItemService.updateById(waitPakinItem)) {
+ return R.error("Update Fail");
+ }
+ return R.ok("Update Success").add(waitPakinItem);
+ }
+
+ @PreAuthorize("hasAuthority('manager:waitPakinItem:remove')")
+ @OperationLog("Delete 缁勬嫋妗ｆ槑缁�")
+ @PostMapping("/waitPakinItem/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!waitPakinItemService.removeByIds(Arrays.asList(ids))) {
+ return R.error("Delete Fail");
+ }
+ return R.ok("Delete Success").add(ids);
+ }
+
+ @PreAuthorize("hasAuthority('manager:waitPakinItem:list')")
+ @PostMapping("/waitPakinItem/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<WaitPakinItem> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(WaitPakinItem::getId, condition);
+ }
+ waitPakinItemService.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:waitPakinItem:list')")
+ @PostMapping("/waitPakinItem/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(waitPakinItemService.list(), WaitPakinItem.class), response);
+ }
+
+}
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
new file mode 100644
index 0000000..a7103f5
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakin.java
@@ -0,0 +1,230 @@
+package com.vincent.rsf.server.manager.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+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
+@TableName("man_wait_pakin")
+public class WaitPakin implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 缂栫爜
+ */
+ @ApiModelProperty(value= "缂栫爜")
+ private String code;
+
+ /**
+ * 璁㈠崟ID
+ */
+ @ApiModelProperty(value= "璁㈠崟ID")
+ private Long ansId;
+
+ /**
+ * 璁㈠崟缂栫爜
+ */
+ @ApiModelProperty(value= "璁㈠崟缂栫爜")
+ private String asnCode;
+
+ /**
+ * 瀹瑰櫒鐮�
+ */
+ @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 WaitPakin() {}
+
+ public WaitPakin(String code,Long ansId,String asnCode,String barcode,Double anfme,Short ioStatus,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ this.code = code;
+ this.ansId = ansId;
+ this.asnCode = asnCode;
+ 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;
+ }
+
+// WaitPakin waitPakin = new WaitPakin(
+// null, // 缂栫爜
+// 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/entity/WaitPakinItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java
new file mode 100644
index 0000000..0ff1132
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java
@@ -0,0 +1,250 @@
+package com.vincent.rsf.server.manager.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+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
+@TableName("man_wait_pakin_item")
+public class WaitPakinItem 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 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 WaitPakinItem() {}
+
+ public WaitPakinItem(Long pakinId,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.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;
+ }
+
+// WaitPakinItem waitPakinItem = new WaitPakinItem(
+// null, // 涓诲崟ID
+// null, // 鐗╂枡鍚嶇О
+// null, // 鐗╂枡ID
+// null, // 鐗╂枡缂栫爜
+// null, // 鏁伴噺
+// null, // 鎵ц涓暟閲�
+// null, // 鍗曚綅
+// null, // 鎵╁睍瀛楁鏍囪瘑
+// null, // 宸插畬鎴愭暟閲�
+// null, // 鎵规鍙�
+// null, // 鐘舵�乕闈炵┖]
+// null, // 鏄惁鍒犻櫎[闈炵┖]
+// null, // 绉熸埛
+// null, // 娣诲姞浜哄憳
+// null, // 娣诲姞鏃堕棿[闈炵┖]
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿[闈炵┖]
+// 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/mapper/WaitPakinItemMapper.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/WaitPakinItemMapper.java
new file mode 100644
index 0000000..52192ae
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/WaitPakinItemMapper.java
@@ -0,0 +1,12 @@
+package com.vincent.rsf.server.manager.mapper;
+
+import com.vincent.rsf.server.manager.entity.WaitPakinItem;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface WaitPakinItemMapper extends BaseMapper<WaitPakinItem> {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/WaitPakinMapper.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/WaitPakinMapper.java
new file mode 100644
index 0000000..9b1dcc7
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/WaitPakinMapper.java
@@ -0,0 +1,12 @@
+package com.vincent.rsf.server.manager.mapper;
+
+import com.vincent.rsf.server.manager.entity.WaitPakin;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface WaitPakinMapper extends BaseMapper<WaitPakin> {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaitPakinItemService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaitPakinItemService.java
new file mode 100644
index 0000000..9fe4647
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaitPakinItemService.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.WaitPakinItem;
+
+public interface WaitPakinItemService extends IService<WaitPakinItem> {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaitPakinService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaitPakinService.java
new file mode 100644
index 0000000..2072654
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaitPakinService.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.WaitPakin;
+
+public interface WaitPakinService extends IService<WaitPakin> {
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinItemServiceImpl.java
new file mode 100644
index 0000000..4664b80
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinItemServiceImpl.java
@@ -0,0 +1,12 @@
+package com.vincent.rsf.server.manager.service.impl;
+
+import com.vincent.rsf.server.manager.mapper.WaitPakinItemMapper;
+import com.vincent.rsf.server.manager.entity.WaitPakinItem;
+import com.vincent.rsf.server.manager.service.WaitPakinItemService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("waitPakinItemService")
+public class WaitPakinItemServiceImpl extends ServiceImpl<WaitPakinItemMapper, WaitPakinItem> implements WaitPakinItemService {
+
+}
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
new file mode 100644
index 0000000..acac827
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
@@ -0,0 +1,12 @@
+package com.vincent.rsf.server.manager.service.impl;
+
+import com.vincent.rsf.server.manager.mapper.WaitPakinMapper;
+import com.vincent.rsf.server.manager.entity.WaitPakin;
+import com.vincent.rsf.server.manager.service.WaitPakinService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("waitPakinService")
+public class WaitPakinServiceImpl extends ServiceImpl<WaitPakinMapper, WaitPakin> implements WaitPakinService {
+
+}
diff --git a/rsf-server/src/main/java/waitPakinItem.sql b/rsf-server/src/main/java/waitPakinItem.sql
new file mode 100644
index 0000000..543f992
--- /dev/null
+++ b/rsf-server/src/main/java/waitPakinItem.sql
@@ -0,0 +1,31 @@
+-- save waitPakinItem record
+-- mysql
+insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `tenant_id`, `status`) values ( 'menu.waitPakinItem', '0', '/manager/waitPakinItem', 'waitPakinItem', '0' , '0', '1' , '1');
+
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Query 缁勬嫋妗ｆ槑缁�', '', '1', 'manager:waitPakinItem:list', '0', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Create 缁勬嫋妗ｆ槑缁�', '', '1', 'manager:waitPakinItem:save', '1', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Update 缁勬嫋妗ｆ槑缁�', '', '1', 'manager:waitPakinItem:update', '2', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Delete 缁勬嫋妗ｆ槑缁�', '', '1', 'manager:waitPakinItem:remove', '3', '1', '1');
+
+-- locale menu name
+waitPakinItem: 'WaitPakinItem',
+
+-- locale field
+waitPakinItem: {
+ pakinId: "pakinId",
+ maktx: "maktx",
+ matnrId: "matnrId",
+ matnrCode: "matnrCode",
+ anfme: "anfme",
+ workQty: "workQty",
+ unit: "unit",
+ fieldsIndex: "fieldsIndex",
+ qty: "qty",
+ batch: "batch",
+},
+
+-- ResourceContent
+import waitPakinItem from './waitPakinItem';
+
+case 'waitPakinItem':
+ return waitPakinItem;
diff --git a/rsf-server/src/main/resources/mapper/manager/WaitPakinItemMapper.xml b/rsf-server/src/main/resources/mapper/manager/WaitPakinItemMapper.xml
new file mode 100644
index 0000000..82ddee2
--- /dev/null
+++ b/rsf-server/src/main/resources/mapper/manager/WaitPakinItemMapper.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.WaitPakinItemMapper">
+
+</mapper>
diff --git a/rsf-server/src/main/resources/mapper/manager/WaitPakinMapper.xml b/rsf-server/src/main/resources/mapper/manager/WaitPakinMapper.xml
new file mode 100644
index 0000000..5b17494
--- /dev/null
+++ b/rsf-server/src/main/resources/mapper/manager/WaitPakinMapper.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.WaitPakinMapper">
+
+</mapper>
--
Gitblit v1.9.1