Merge branch 'main' of http://112.4.208.194:3000/liangzhou/wms_snN7pp_nantong

# Conflicts:
#	wms-admin/src/main/java/com/ruoyi/web/controller/business/TOngoodsshelfController.java

wms-admin/src/main/java/com/ruoyi/web/controller/business/TOngoodsshelfController.java

@@ -81,6 +81,8 @@ public class TOngoodsshelfController extends BaseController
     @Autowired
     private ITBaseProviderService tBaseProviderService;
 
+    @Autowired
+    private ITemperService temperService;
 
     @RequiresPermissions("business:ongoodsshelf:view")
     @GetMapping()
@@ -92,7 +94,6 @@ public class TOngoodsshelfController extends BaseController
         // 获取供应商
         List<TBaseProvider> providers = tBaseProviderService.list();
         mmap.put("providers", providers);
-
         return prefix + "/ongoodsshelf";
     }
 
@@ -220,6 +221,27 @@ public class TOngoodsshelfController extends BaseController
             logger.error("提交入库的数据为空");
             return error();
         }
+        // 查询当前入库的供应商
+        TBaseProvider currentInProvider = tBaseProviderService.getOne(new LambdaQueryWrapper<TBaseProvider>()
+                .eq(TBaseProvider::getRemark, "1")
+                .last("limit 1"));
+        if (currentInProvider == null) {
+            logger.error("没有正在入库的供应商，请开启后重试。");
+            return error("没有正在入库的供应商，请开启后重试。");
+        }
+        // 获取温度
+        List<Temper> temperList = temperService.list(new LambdaQueryWrapper<Temper>()
+                .eq(Temper::getRkId, "1"));
+        if (temperList == null || temperList.isEmpty()) {
+            logger.error("获取温度错误。");
+            return error("获取温度错误。");
+        } else {
+            Temper currentTemper = temperList.get(0);
+            if (currentTemper.getRkDegree().compareTo(currentTemper.getMaxDegree()) >= 0) {
+                logger.error("入库温度过高。");
+                return error("入库温度过高。");
+            }
+        }
         // 入库id
         String lotId = OrderCodeFactory.getOrderCode("RK", "");
         // 创建日期
@@ -232,8 +254,13 @@ public class TOngoodsshelfController extends BaseController
         } else {
             sysUser.setUserName(tOngoodsshelves.get(0).getUserName());
         }
+        boolean providerValidation = true;
         for (TOngoodsshelf s:
                 tOngoodsshelves) {
+            if (!Objects.equals(s.getProviderId(), currentInProvider.getProviderId())) {
+                providerValidation = false;
+                break;
+            }
             s.setAgvsts("0");
             s.setTasktype("0");
             s.setLotId(lotId);
@@ -244,7 +271,10 @@ public class TOngoodsshelfController extends BaseController
             // 设置子库ID
             s.setWhseloc("121-108");
         }
-
+        if (!providerValidation) {
+            logger.error("不在入库状态的供应商不允许入库。");
+            return error("不在入库状态的供应商不允许入库。");
+        }
         // 开始对接ebs
         String ebsCongfirmResult = ebsConfirm(tOngoodsshelves);
         if (StringUtils.isNotEmpty(ebsCongfirmResult)) {
@@ -359,6 +389,7 @@ public class TOngoodsshelfController extends BaseController
                 TEbsOrder queryOrder = new TEbsOrder();
                 queryOrder.setPhaSegment1(poOrder);// 订单号
                 queryOrder.setItemId(itemId);
+//                queryOrder.setVendorId(tOngoodsshelve.getProviderId());
                 List<TEbsOrder> ebsOrders = itEbsOrderService.selectTEbsOrderList(queryOrder);
                 logger.info("查询到的本地缓存订单：{}", JSON.toJSONString(ebsOrders));
                 if (ebsOrders.size() > 0) {// 本地数据库中缓存过
@@ -371,6 +402,7 @@ public class TOngoodsshelfController extends BaseController
                     }
                     // 插入ebsOrder表
                     for (TEbsOrder targetOrder : targetOrders) {
+                        targetOrder.setCreateDate(new Date());
                         itEbsOrderService.insertTEbsOrder(targetOrder);
                     }
                 }

wms-admin/src/main/resources/application-druid.yml

@@ -5,16 +5,16 @@ spring:
         driverClassName: com.mysql.cj.jdbc.Driver
         druid:
             # 主库数据源
-#            master:
-#                url: jdbc:mysql://localhost:3306/wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#                username: root
-##                password: ntscc@2018
-#                password: root
-
             master:
-                url: jdbc:mysql://192.168.234.134:3306/wms_ntpp_n7?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: developer
-                password: developer
+                url: jdbc:mysql://localhost:3306/wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: root
+#                password: ntscc@2018
+                password: root
+
+#            master:
+#                url: jdbc:mysql://192.168.234.134:3306/wms_ntpp_n7?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                username: developer
+#                password: developer
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

wms-admin/target/classes/application-druid.yml

@@ -5,16 +5,16 @@ spring:
         driverClassName: com.mysql.cj.jdbc.Driver
         druid:
             # 主库数据源
-#            master:
-#                url: jdbc:mysql://localhost:3306/wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#                username: root
-##                password: ntscc@2018
-#                password: root
-
             master:
-                url: jdbc:mysql://192.168.234.134:3306/wms_ntpp_n7?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: developer
-                password: developer
+                url: jdbc:mysql://localhost:3306/wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: root
+#                password: ntscc@2018
+                password: root
+
+#            master:
+#                url: jdbc:mysql://192.168.234.134:3306/wms_ntpp_n7?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                username: developer
+#                password: developer
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

wms-business/src/main/java/com/ruoyi/business/domain/TEbsOrder.java

@@ -2,9 +2,12 @@ package com.ruoyi.business.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.util.Date;
+
 /**
  * 【EBS订单信息】对象 t_ebs_order
  *
@@ -190,6 +193,20 @@ public class TEbsOrder extends BaseEntity {
     @Excel(name = "订单物资收货检验优先级")
     @TableField("checkPriority")
     private String checkPriority;
+    /**
+     * 过期时间
+     */
+    @Excel(name = "过期时间")
+    @TableField("dueDate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date dueDate;
+    /**
+     * 创建时间
+     */
+    @Excel(name = "创建时间")
+    @TableField("createDate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createDate;
 
     public String getPhaSegment1() {
         return phaSegment1;
@@ -390,5 +407,21 @@ public class TEbsOrder extends BaseEntity {
     public void setCheckPriority(String checkPriority) {
         this.checkPriority = checkPriority;
     }
+
+    public Date getDueDate() {
+        return dueDate;
+    }
+
+    public void setDueDate(Date dueDate) {
+        this.dueDate = dueDate;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
 }
 

wms-business/src/main/java/com/ruoyi/business/domain/Temper.java

@@ -1,50 +1,43 @@
 package com.ruoyi.business.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
 /**
  * T_base_temper 表
  */
+@Data
+@TableName(value = "T_base_temper", autoResultMap = true)
 public class Temper {
 
     /**
      * 仓库温度
      */
+    @TableField(value = "rkDegree")
     private BigDecimal rkDegree;
 
+    /**
+     * 最高温度
+     */
+    @TableField(value = "maxDegree")
+    private BigDecimal maxDegree;
+
     /**
      * 仓库id
      */
+    @TableId(value = "rkId")
     private Integer rkId;
 
     /**
      * 更新时间
      */
+    @TableField(value = "updateTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
-
-
-    public BigDecimal getRkDegree() {
-        return rkDegree;
-    }
-
-    public void setRkDegree(BigDecimal rkDegree) {
-        this.rkDegree = rkDegree;
-    }
-
-    public Integer getRkId() {
-        return rkId;
-    }
-
-    public void setRkId(Integer rkId) {
-        this.rkId = rkId;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
 }

wms-business/src/main/java/com/ruoyi/business/mapper/TemperMapper.java

@@ -1,12 +1,13 @@
 package com.ruoyi.business.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.business.domain.Temper;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
 @Mapper
-public interface TemperMapper {
+public interface TemperMapper extends BaseMapper<Temper> {
 
     /**
      * 查询温度列表

wms-business/src/main/java/com/ruoyi/business/service/ITemperService.java

@@ -0,0 +1,7 @@
+package com.ruoyi.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.business.domain.Temper;
+
+public interface ITemperService extends IService<Temper> {
+}

wms-business/src/main/java/com/ruoyi/business/service/impl/TemperServiceImpl.java

@@ -0,0 +1,11 @@
+package com.ruoyi.business.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.business.domain.Temper;
+import com.ruoyi.business.mapper.TemperMapper;
+import com.ruoyi.business.service.ITemperService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TemperServiceImpl extends ServiceImpl<TemperMapper, Temper> implements ITemperService {
+}

wms-business/src/main/resources/mapper/TEbsOrderMapper.xml

@@ -28,6 +28,8 @@
         <result property="receivingRoutingId" column="receivingRoutingId" />
         <result property="lotControl" column="lotControl" />
         <result property="checkPriority" column="checkPriority" />
+        <result property="dueDate" column="dueDate" />
+        <result property="createDate" column="createDate" />
     </resultMap>
 
     <sql id="selectTEbsOrderALl">
@@ -40,6 +42,7 @@
             <if test="phaSegment1 != null and phaSegment1 != ''"> and phaSegment1 = #{phaSegment1}</if>
             <if test="itemId != null"> and itemId = #{itemId}</if>
         </where>
+        order by dueDate;
     </select>
 
     <insert id="insertTEbsOrder" parameterType="TEbsOrder">
@@ -70,6 +73,8 @@
             <if test="receivingRoutingId != null">receivingRoutingId,</if>
             <if test="lotControl != null">lotControl,</if>
             <if test="checkPriority != null">checkPriority,</if>
+            <if test="dueDate != null">dueDate,</if>
+            <if test="createDate != null">createDate,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="phaSegment1 != null">#{phaSegment1},</if>
@@ -97,6 +102,8 @@
             <if test="receivingRoutingId != null">#{receivingRoutingId},</if>
             <if test="lotControl != null">#{lotControl},</if>
             <if test="checkPriority != null">#{checkPriority},</if>
+            <if test="dueDate != null">#{dueDate},</if>
+            <if test="createDate != null">#{createDate},</if>
         </trim>
     </insert>
 
@@ -126,11 +133,12 @@
             <if test="receivingRoutingId != null">receivingRoutingId = #{receivingRoutingId},</if>
             <if test="lotControl != null">lotControl = #{lotControl},</if>
             <if test="checkPriority != null">checkPriority = #{checkPriority},</if>
+            <if test="createDate != null">createDate = #{createDate},</if>
         </trim>
-        where phaSegment1 = #{phaSegment1} and itemId = #{itemId}
+        where phaSegment1 = #{phaSegment1} and itemId = #{itemId} and dueDate = #{dueDate}
     </update>
 
     <delete id="deleteTEbsOrder" parameterType="TEbsOrder">
-        delete from t_ebs_order where phaSegment1 = #{phaSegment1} and itemId = #{itemId}
+        delete from t_ebs_order where phaSegment1 = #{phaSegment1} and itemId = #{itemId} and dueDate = #{dueDate}
     </delete>
 </mapper>

wms-business/target/classes/mapper/TEbsOrderMapper.xml

@@ -28,6 +28,8 @@
         <result property="receivingRoutingId" column="receivingRoutingId" />
         <result property="lotControl" column="lotControl" />
         <result property="checkPriority" column="checkPriority" />
+        <result property="dueDate" column="dueDate" />
+        <result property="createDate" column="createDate" />
     </resultMap>
 
     <sql id="selectTEbsOrderALl">
@@ -40,6 +42,7 @@
             <if test="phaSegment1 != null and phaSegment1 != ''"> and phaSegment1 = #{phaSegment1}</if>
             <if test="itemId != null"> and itemId = #{itemId}</if>
         </where>
+        order by dueDate;
     </select>
 
     <insert id="insertTEbsOrder" parameterType="TEbsOrder">
@@ -70,6 +73,8 @@
             <if test="receivingRoutingId != null">receivingRoutingId,</if>
             <if test="lotControl != null">lotControl,</if>
             <if test="checkPriority != null">checkPriority,</if>
+            <if test="dueDate != null">dueDate,</if>
+            <if test="createDate != null">createDate,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="phaSegment1 != null">#{phaSegment1},</if>
@@ -97,6 +102,8 @@
             <if test="receivingRoutingId != null">#{receivingRoutingId},</if>
             <if test="lotControl != null">#{lotControl},</if>
             <if test="checkPriority != null">#{checkPriority},</if>
+            <if test="dueDate != null">#{dueDate},</if>
+            <if test="createDate != null">#{createDate},</if>
         </trim>
     </insert>
 
@@ -126,11 +133,12 @@
             <if test="receivingRoutingId != null">receivingRoutingId = #{receivingRoutingId},</if>
             <if test="lotControl != null">lotControl = #{lotControl},</if>
             <if test="checkPriority != null">checkPriority = #{checkPriority},</if>
+            <if test="createDate != null">createDate = #{createDate},</if>
         </trim>
-        where phaSegment1 = #{phaSegment1} and itemId = #{itemId}
+        where phaSegment1 = #{phaSegment1} and itemId = #{itemId} and dueDate = #{dueDate}
     </update>
 
     <delete id="deleteTEbsOrder" parameterType="TEbsOrder">
-        delete from t_ebs_order where phaSegment1 = #{phaSegment1} and itemId = #{itemId}
+        delete from t_ebs_order where phaSegment1 = #{phaSegment1} and itemId = #{itemId} and dueDate = #{dueDate}
     </delete>
 </mapper>