Merge remote-tracking branch 'origin/master'

src/main/java/com/glxp/api/controller/inv/DeviceReceiveOrderController.java

@@ -63,6 +63,8 @@ public class DeviceReceiveOrderController {
      */
     @PostMapping("/device/receive/order/update")
     public BaseResponse update(@RequestBody DeviceReceiveOrderEntity deviceReceiveOrderEntity, BindingResult bindingResult) {
+        Integer integer = deviceReceiveOrderService.selectOrderIdByOrderId(deviceReceiveOrderEntity.getOrderId());
+        deviceReceiveOrderEntity.setId(integer);
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }

src/main/java/com/glxp/api/dao/inv/DeviceReceiveOrderDao.java

@@ -25,6 +25,9 @@ public interface DeviceReceiveOrderDao extends BaseMapper<DeviceReceiveOrderEnti
      */
     String selectOrderIdById(@Param("id") Integer id);
 
+    Integer selectOrderIdByOrderId(@Param("orderId") String  orderId);
+
+
     /**
      * 更新设备领用记录状态
      *

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

@@ -1,112 +1,160 @@
 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 = "createTime")
     private Date createTime;
 
     /**
      * 更新时间
      */
+    @TableField(value = "updateTime")
     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";
 
     /**
      * 产品名称
      */
     private String productName;
 
+    public static final String COL_EXPIREDATE = "expireDate";
+
     /**
      * 仓库名称
      */
     private String invName;
 
+    public static final String COL_SERIALNO = "serialNo";
+
     /**
      * 货位名称
      */
     private String invSpaceName;
 
+    public static final String COL_INVCODE = "invCode";
+
     /**
      * 货位名称
      */
     private String invSpaceCode;
 
+    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";
+
     /**
      * 部门名称
      */

src/main/java/com/glxp/api/service/inv/DeviceReceiveOrderService.java

@@ -4,6 +4,7 @@ import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.entity.inv.DeviceReceiveOrderEntity;
 import com.glxp.api.req.inv.FilterDeviceReceiveOrderRequest;
 import com.glxp.api.res.inv.DeviceReceiveOrderResponse;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -58,4 +59,6 @@ public interface DeviceReceiveOrderService {
      */
     BaseResponse deleteDeviceCollectOrder(Integer id);
 
+    Integer selectOrderIdByOrderId( String  orderId);
+
 }

src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderServiceImpl.java

@@ -154,4 +154,9 @@ public class DeviceReceiveOrderServiceImpl implements DeviceReceiveOrderService
         deviceReceiveOrderDao.deleteById(id);
         return ResultVOUtils.success("删除成功！");
     }
+
+    @Override
+    public Integer selectOrderIdByOrderId(String orderId) {
+        return deviceReceiveOrderDao.selectOrderIdByOrderId(orderId);
+    }
 }

src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDao.xml

@@ -43,6 +43,12 @@
         where id = #{id}
     </select>
 
+    <select id="selectOrderIdByOrderId" resultType="java.lang.Integer">
+        select id
+        from device_receive_order
+        where orderId = #{orderId}
+    </select>
+
     <update id="updateStatusById">
         update device_receive_order set status = #{status} where id = #{id}
     </update>