单据

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -80,6 +80,8 @@ public class IoOrderController extends BaseController {
     @PostMapping("warehouse/inout/saveOrderWeb")
     public BaseResponse saveOrderWeb(@RequestBody AddOrderRequest addOrderRequest) {
         IoOrderEntity orderEntity = new IoOrderEntity();
+        if (StrUtil.isEmpty(addOrderRequest.getAction()))
+            return ResultVOUtils.error(500, "单据类型不能为空");
         orderEntity.setAction(addOrderRequest.getAction());
         BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(addOrderRequest.getAction());
         orderEntity.setMainAction(bussinessTypeEntity.getMainAction());

src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java

@@ -271,7 +271,7 @@ public class BasicBussinessTypeEntity {
      * 订单详情展示方式：0：根据批次号展示，1:根据条码展示
      */
     @TableField(value = "orderVisibleType")
-    private boolean orderVisibleType;
+    private int orderVisibleType;
 
     /**
      * 是否校验复制单据

src/main/java/com/glxp/api/entity/inv/DeviceReceiveOrderDetailEntity.java

@@ -1,144 +1,114 @@
 package com.glxp.api.entity.inv;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.util.Date;
 
-/**
-    * 设备领用记录详情
-    */
 @Data
-@TableName(value = "device_receive_order_detail")
 public class DeviceReceiveOrderDetailEntity {
+
     /**
      * id
      */
-    @TableId(value = "id", type = IdType.INPUT)
     private Integer id;
 
     /**
      * 设备领用记录号
      */
-    @TableField(value = "orderIdFk")
     private String orderIdFk;
 
     /**
      * 原始码
      */
-    @TableField(value = "originCode")
     private String originCode;
 
     /**
      * 码
      */
-    @TableField(value = "code")
     private String code;
 
     /**
      * 耗材字典ID
      */
-    @TableField(value = "relId")
     private Long relId;
 
     /**
      * 产品DI
      */
-    @TableField(value = "nameCode")
     private String nameCode;
 
     /**
      * 批次号
      */
-    @TableField(value = "batchNo")
     private String batchNo;
 
     /**
      * 生产日期
      */
-    @TableField(value = "productionDate")
     private String productionDate;
 
     /**
      * 失效日期
      */
-    @TableField(value = "expireDate")
     private String expireDate;
 
     /**
      * 序列号
      */
-    @TableField(value = "serialNo")
     private String serialNo;
 
     /**
-     * 领用仓库
+     * 领用时间
      */
-    @TableField(value = "invCode")
+    private Date createTime;
-    private String invCode;
 
     /**
-     * 领用货位
+     * 更新时间
      */
-    @TableField(value = "invSpaceCode")
+    private Date updateTime;
-    private String invSpaceCode;
 
     /**
-     * 接收仓库
+     * 产品名称
      */
-    @TableField(value = "receiveInvCode")
+    private String productName;
-    private String receiveInvCode;
 
     /**
-     * 接收货位
+     * 仓库名称
      */
-    @TableField(value = "receiveSpaceCode")
+    private String invName;
-    private String receiveSpaceCode;
 
     /**
-     * 领用时间
+     * 货位名称
      */
-    @TableField(value = "createTime")
+    private String invSpaceName;
-    private Date createTime;
 
     /**
-     * 更新时间
+     * 货位名称
      */
-    @TableField(value = "updateTime")
+    private String invSpaceCode;
-    private Date updateTime;
-
-    public static final String COL_ID = "id";
-
-    public static final String COL_ORDERIDFK = "orderIdFk";
-
-    public static final String COL_ORIGINCODE = "originCode";
-
-    public static final String COL_CODE = "code";
-
-    public static final String COL_RELID = "relId";
-
-    public static final String COL_NAMECODE = "nameCode";
-
-    public static final String COL_BATCHNO = "batchNo";
-
-    public static final String COL_PRODUCEDATE = "produceDate";
-
-    public static final String COL_EXPIREDATE = "expireDate";
-
-    public static final String COL_SERIALNO = "serialNo";
-
-    public static final String COL_INVCODE = "invCode";
 
-    public static final String COL_INVSPACECODE = "invSpaceCode";
+    /**
+     * 注册/备案凭证号
+     */
+    private String zczbhhzbapzbh;
 
-    public static final String COL_RECEIVEINVCODE = "receiveInvCode";
+    /**
+     * 生产厂家
+     */
+    private String ylqxzcrbarmc;
 
-    public static final String COL_RECEIVESPACECODE = "receiveSpaceCode";
+    /**
+     * 规格型号
+     */
+    private String ggxh;
 
-    public static final String COL_CREATETIME = "createTime";
+    /**
+     * 是否可以自定义序列号
+     */
+    private Boolean editSerialNo;
 
-    public static final String COL_UPDATETIME = "updateTime";
+    /**
+     * 部门名称
+     */
+    private String deptName;
 }

src/main/java/com/glxp/api/entity/inv/DeviceReceiveOrderEntity.java

@@ -1,96 +1,114 @@
 package com.glxp.api.entity.inv;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.util.Date;
 
-/**
-    * 设备领用记录表
-    */
 @Data
-@TableName(value = "device_receive_order")
 public class DeviceReceiveOrderEntity {
+
     /**
      * id
      */
-    @TableId(value = "id", type = IdType.INPUT)
     private Integer id;
 
     /**
      * 领用记录号
      */
-    @TableField(value = "orderId")
     private String orderId;
 
     /**
      * 领用部门
      */
-    @TableField(value = "deptCode")
+    private String fromDeptCode;
+
+    /**
+     * 领用仓库
+     */
+    private String fromInvCode;
+
+    /**
+     * 领用货位
+     */
+    private String fromInvSpaceCode;
+
+    /**
+     * 接收部门
+     */
     private String deptCode;
 
+    /**
+     * 接收仓库
+     */
+    private String invCode;
+
+    /**
+     * 接收货位
+     */
+    private String invSpaceCode;
+
     /**
      * 状态   0：草稿   1：未审核   2：已审核
      */
-    @TableField(value = "`status`")
     private Integer status;
 
     /**
      * 创建人
      */
-    @TableField(value = "`createUser`")
     private String createUser;
 
     /**
      * 审核人
      */
-    @TableField(value = "auditUser")
     private String auditUser;
 
+    /**
+     * 领用人
+     */
+    private String receiveUser;
+
     /**
      * 领用时间
      */
-    @TableField(value = "createTime")
     private Date createTime;
 
     /**
      * 更新时间
      */
-    @TableField(value = "updateTime")
     private Date updateTime;
 
-    /**
-     * 领用人
-     */
-    @TableField(value = "receiveUser")
-    private String receiveUser;
-
     /**
      * 备注
      */
-    @TableField(value = "remark")
     private String remark;
 
-    public static final String COL_ID = "id";
+    /**
-
+     * 接收部门
-    public static final String COL_ORDERID = "orderId";
+     */
-
+    private String deptName;
-    public static final String COL_DEPTCODE = "deptCode";
-
-    public static final String COL_STATUS = "status";
-
-    public static final String COL_CREATEUSER = "createUser";
 
-    public static final String COL_AUDITUSER = "auditUser";
+    /**
+     * 接收仓库
+     */
+    private String invName;
 
-    public static final String COL_CREATETIME = "createTime";
+    /**
+     * 接收货位
+     */
+    private String invSpaceName;
 
-    public static final String COL_UPDATETIME = "updateTime";
+    /**
+     * 领用部门名称
+     */
+    private String fromDeptName;
 
-    public static final String COL_RECEIVEUSER = "receiveUser";
+    /**
+     * 领用仓库名称
+     */
+    private String fromInvName;
 
-    public static final String COL_REMARK = "remark";
+    /**
+     * 领用货位名称
+     */
+    private String fromInvSpaceName;
 }

src/main/resources/application-dev.yml

@@ -4,9 +4,9 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_wms_ww?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
-    password: Glxp@6066
+    password: 123456
     hikari:
       connection-timeout: 60000
       maximum-pool-size: 60

src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml

@@ -48,7 +48,8 @@
         select *
         from basic_entrust_accept
         where `action` = #{action}
-          and `entrustUser` = #{entrustUser} limit 1
+          and `entrustUser` = #{entrustUser}
+        limit 1
     </select>
 
 
@@ -59,7 +60,7 @@
                b.action,
                b.mainAction
         from basic_entrust_accept
-                 INNER JOIN basic_bussiness_type b on a.action = b.action
+                 INNER JOIN basic_bussiness_type b on basic_entrust_accept.action = b.action
                  LEFT JOIN auth_user on basic_entrust_accept.entrustUser = auth_user.id
         <where>
             <if test="id != '' and id != null">
@@ -134,9 +135,9 @@
             parameterType="com.glxp.api.entity.basic.EntrustReceEntity">
         replace
             INTO basic_entrust_accept(`action`, curDept, entrustInv, `entrustUser`, userId,
-        updateTime, remark,entrustAction,finishRece,curInv,entrustDept,entrustInv,entrustEnd)
+                                      updateTime, remark, entrustAction, finishRece, curInv, entrustDept, entrustInv,
-        values (
+                                      entrustEnd)
-        #{action},
+        values (#{action},
                 #{entrustInv},
                 #{entrustUser},
                 #{userId},
@@ -147,8 +148,7 @@
                 #{curInv},
                 #{entrustDept},
                 #{entrustInv},
-        #{entrustEnd}
+                #{entrustEnd})
-        )
     </insert>