Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java

@@ -134,7 +134,7 @@ public class IoCollectOrderCodeManController extends BaseController {
                         .fromType(bustypeEntity.getFromType())
                         .fromCorp(addTagCodeReqeust.getFromCorp())
                         .billTime(new Date())
-                        .workPlaceCode(workPlace.getWorkplaceId() + "")
+                        .workPlaceCode(workPlace.getWorkplaceId())
                         .createTime(new Date())
                         .createUser(getUserId() + "")
                         .updateTime(new Date())

src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java

@@ -62,7 +62,7 @@ public class IoCollectOrderController extends BaseController {
      */
     @GetMapping("/udiwms/basic/collect/order/next")
     public BaseResponse getNextOrder(CollectOrderRequest collectOrderRequest) {
-        if (StrUtil.isEmpty(collectOrderRequest.getWorkPlaceCode())) {
+        if (collectOrderRequest.getWorkPlaceCode() == null) {
             return ResultVOUtils.error(500, "工位不能为空！");
         }
         CollectOrderRequest request = new CollectOrderRequest();

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

@@ -66,4 +66,15 @@ public class IoSplitFifoController extends BaseController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+    @GetMapping("/udiwms/ioSplit/findInvRemind")
+    public BaseResponse findInvRemind(IoSplitFifoCodeRequest splitFifoCodeRequest,
+                                   BindingResult bindingResult) {
+        Long workPlaceCode = splitFifoCodeRequest.getWorkPlaceCode();
+        if (workPlaceCode == null){
+            return ResultVOUtils.error("工位编号不可为空!");
+        }
+        String invRemind = splitFifoCodeService.findInvRemind(workPlaceCode);
+        return ResultVOUtils.success(invRemind);
+    }
+
 }

src/main/java/com/glxp/api/dao/inout/IoSplitFifoCodeMapper.java

@@ -7,6 +7,7 @@ import com.glxp.api.req.inout.IoSplitCodeRequest;
 import com.glxp.api.req.inout.IoSplitFifoCodeRequest;
 import com.glxp.api.res.inout.IoSplitCodeResponse;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -15,6 +16,8 @@ public interface IoSplitFifoCodeMapper extends BaseMapper<IoSplitFifoCodeEntity>
 
     List<IoSplitCodeResponse> filterGroupList(IoSplitFifoCodeRequest splitFifoCodeRequest);
 
+    List<IoSplitCodeResponse> findInvRemind(@Param("workPlaceCode") Long workPlaceCode);
+
     List<IoSplitCodeResponse> filterList(IoSplitFifoCodeRequest splitFifoCodeRequest);
 
 }

src/main/java/com/glxp/api/entity/auth/SysWorkplace.java

@@ -71,7 +71,7 @@ public class SysWorkplace implements Serializable {
     private String chargeUser;
 
     @TableField(value = "constituencies")
-    private Long constituencies;
+    private String constituencies;
 
 
     /**
@@ -122,6 +122,12 @@ public class SysWorkplace implements Serializable {
     @TableField(value = "deptCode")
     private String deptCode;
 
+    /**
+     * 存量提醒数
+     */
+    @TableField(value = "invRemindNumber")
+    private Integer invRemindNumber;
+
 
 
     @TableField(exist = false)

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

@@ -90,8 +90,11 @@ public class BasicCollectBustypeEntity implements Serializable {
     private Date updateTime;
 
 
-
-
+    /**
+     * 排序数字
+     */
+    @TableField(value = "sortNumber")
+    private Integer sortNumber;
 
     private static final long serialVersionUID = 1L;
 }

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

@@ -149,6 +149,6 @@ public class BasicSkPrescribeEntity {
      * 工位编码
      */
     @TableField(value = "workPlaceCode")
-    private String workPlaceCode;
+    private Long workPlaceCode;
 
 }

src/main/java/com/glxp/api/entity/collect/IoCollectCode.java

@@ -86,7 +86,7 @@ public class IoCollectCode implements Serializable {
      */
     @TableField(value = "workPlaceCode")
     @ApiModelProperty(value="工位")
-    private String workPlaceCode;
+    private Long workPlaceCode;
 
     /**
      * 工位负责人
@@ -103,4 +103,4 @@ public class IoCollectCode implements Serializable {
     private String remark;
 
     private static final long serialVersionUID = 1L;
-}
+}

src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java

@@ -97,7 +97,7 @@ public class IoCollectOrder implements Serializable {
      */
     @TableField(value = "workPlaceCode")
     @ApiModelProperty(value = "工位编码")
-    private String workPlaceCode;
+    private Long workPlaceCode;
 
     /**
      * 备注

src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java

@@ -322,7 +322,7 @@ public class IoOrderEntity {
      * 工位代码
      */
     @TableField(value = "workPlaceCode")
-    private String workPlaceCode;
+    private Long workPlaceCode;
     /**
      * 单据产品类型  1:器械;2:药品
      */

src/main/java/com/glxp/api/entity/inout/IoSplitCodeEntity.java

@@ -195,7 +195,7 @@ public class IoSplitCodeEntity implements Serializable {
      */
     @TableField(value = "workPlaceCode")
     @ApiModelProperty(value = "工位编码")
-    private String workPlaceCode;
+    private Long workPlaceCode;
 
 
     /**

src/main/java/com/glxp/api/entity/inout/IoSplitFifoCodeEntity.java

@@ -126,7 +126,7 @@ public class IoSplitFifoCodeEntity implements Serializable {
      */
     @TableField(value = "workPlaceCode")
     @ApiModelProperty(value = "工位")
-    private String workPlaceCode;
+    private Long workPlaceCode;
 
     /**
      * 1:耗材；2：药品

src/main/java/com/glxp/api/req/basic/PrescribeBindWorkRequest.java

@@ -9,5 +9,5 @@ import java.util.List;
 public class PrescribeBindWorkRequest {
 
     BasicSkPrescribeEntity prescribeListData;
-    String workplaceCode;
+    Long workplaceCode;
 }

src/main/java/com/glxp/api/req/collect/CollectOrderBindWorkRequest.java

@@ -10,5 +10,5 @@ public class CollectOrderBindWorkRequest {
 
     List<IoCollectOrder> list;
     IoCollectOrder collOrder;
-    String workplaceCode;
+    Long workplaceCode;
 }

src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java

@@ -60,7 +60,7 @@ public class CollectOrderRequest extends ListPageRequest {
     /**
      * 工位编码
      */
-    private String workPlaceCode;
+    private Long workPlaceCode;
 
     /**
      * 备注

src/main/java/com/glxp/api/req/inout/AddOrderRequest.java

@@ -44,7 +44,7 @@ public class AddOrderRequest {
     private String preInBatchNo;
     private String sickerAdNum;
 
-    private String workPlaceCode;
+    private Long workPlaceCode;
     private Integer productType;
 
     /**

src/main/java/com/glxp/api/req/inout/AddTagCodeReqeust.java

@@ -20,7 +20,7 @@ public class AddTagCodeReqeust {
 
     private String billNo;
 
-    private String workPlaceCode;
+    private Long workPlaceCode;
     private String fromCorp;
     private String invCode;
     private Boolean insert;

src/main/java/com/glxp/api/req/inout/IoSplitCodeRequest.java

@@ -133,7 +133,7 @@ public class IoSplitCodeRequest extends ListPageRequest {
     /**
      * 工位
      */
-    private String workPlaceCode;
+    private Long workPlaceCode;
 
 
 }

src/main/java/com/glxp/api/req/inout/IoSplitFifoCodeRequest.java

@@ -84,7 +84,7 @@ public class IoSplitFifoCodeRequest extends ListPageRequest {
     /**
      * 工位
      */
-    private String workPlaceCode;
+    private Long workPlaceCode;
 
     /**
      * 1:耗材；2：药品

src/main/java/com/glxp/api/res/basic/BasicSkPrescribeResponse.java

@@ -84,7 +84,7 @@ public class BasicSkPrescribeResponse {
 
     private String clinicNumber;
 
-    private String workPlaceCode;
+    private Long workPlaceCode;
     private String workPlaceName;
     /**
      * 处方明细

src/main/java/com/glxp/api/res/basic/SysWorkplaceResponse.java

@@ -24,4 +24,7 @@ public class SysWorkplaceResponse extends SysWorkplace {
 
     //单据来源系统
     private String fromTypeName;
+
+    //所属部门名称
+    private String deptCodeName;
 }

src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java

@@ -58,7 +58,7 @@ public class IoCollectOrderResponse {
     /**
      * 工位编码
      */
-    private String workPlaceCode;
+    private Long workPlaceCode;
 
     /**
      * 备注

src/main/java/com/glxp/api/res/inout/IoOrderResponse.java

@@ -269,7 +269,7 @@ public class IoOrderResponse {
     /**
      * 工位代码
      */
-    private String workPlaceCode;
+    private Long workPlaceCode;
     /**
      * 工位名称
      */

src/main/java/com/glxp/api/res/inout/IoSplitCodeResponse.java

@@ -86,7 +86,7 @@ public class IoSplitCodeResponse {
     /**
      * 工位
      */
-    private String workPlaceCode;
+    private Long workPlaceCode;
 
     private String workPlaceName;
 

src/main/java/com/glxp/api/service/auth/SysWorkplaceService.java

@@ -39,7 +39,7 @@ public class SysWorkplaceService extends ServiceImpl<SysWorkplaceDao, SysWorkpla
     }
 
 
-    public SysWorkplace getWorkplace(String code) {
+    public SysWorkplace getWorkplace(Long code) {
         return super.baseMapper.selectOne(
                 new LambdaQueryWrapper<SysWorkplace>().eq(SysWorkplace::getWorkplaceId, code).last("limit 1"));
     }

src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java

@@ -152,7 +152,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
 
         List<IoCollectOrder> collectOrderList = new ArrayList<>();
         for (BasicSkPrescribeEntity basicSkPrescribeEntity : basicSkPrescribeEntities) {
-            BasicCollectBustypeEntity collectBustypeEntity = collectBustypeService.findByAddr(basicSkPrescribeEntity.getWorkPlaceCode());
+            BasicCollectBustypeEntity collectBustypeEntity = collectBustypeService.findByAddr(String.valueOf(basicSkPrescribeEntity.getWorkPlaceCode()));
             if (collectBustypeEntity == null)
                 continue;
             if (collectOrderMapper.exists(new LambdaQueryWrapper<IoCollectOrder>().eq(IoCollectOrder::getBillNo, basicSkPrescribeEntity.getCode()))) {

src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java

@@ -55,11 +55,11 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
     }
 
 
-    public List<IoSplitCodeEntity> findSplitCodes(Long relId, String batchNo, String workPlaceCode) {
+    public List<IoSplitCodeEntity> findSplitCodes(Long relId, String batchNo, Long workPlaceCode) {
         List<IoSplitCodeEntity> ioSplitCodeEntities = splitCodeMapper.selectList(new LambdaQueryWrapper<IoSplitCodeEntity>()
                 .eq(IoSplitCodeEntity::getRelId, relId)
                 .eq(StrUtil.isNotEmpty(batchNo), IoSplitCodeEntity::getBatchNo, batchNo)
-                .eq(StrUtil.isNotEmpty(workPlaceCode), IoSplitCodeEntity::getWorkPlaceCode, workPlaceCode)
+                .eq(workPlaceCode != null, IoSplitCodeEntity::getWorkPlaceCode, workPlaceCode)
                 .in(IoSplitCodeEntity::getStatus, 1, 2).orderByAsc(IoSplitCodeEntity::getInBactchNo));
         return ioSplitCodeEntities;
     }

src/main/java/com/glxp/api/service/inout/IoSplitFifoCodeService.java

@@ -1,13 +1,18 @@
 package com.glxp.api.service.inout;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
+import com.glxp.api.dao.auth.SysWorkplaceDao;
 import com.glxp.api.dao.inout.IoSplitFifoCodeMapper;
+import com.glxp.api.entity.auth.SysWorkplace;
 import com.glxp.api.entity.inout.IoSplitFifoCodeEntity;
+import com.glxp.api.exception.JsonException;
 import com.glxp.api.req.inout.IoSplitFifoCodeRequest;
 import com.glxp.api.res.inout.IoSplitCodeResponse;
+import com.glxp.api.service.auth.SysWorkplaceService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -19,6 +24,8 @@ public class IoSplitFifoCodeService extends ServiceImpl<IoSplitFifoCodeMapper, I
 
     @Resource
     IoSplitFifoCodeMapper splitFifoCodeMapper;
+    @Resource
+    SysWorkplaceService sysWorkplaceService;
 
     public List<IoSplitCodeResponse> filterGroupList(IoSplitFifoCodeRequest splitFifoCodeRequest) {
         if (splitFifoCodeRequest == null) {
@@ -44,23 +51,53 @@ public class IoSplitFifoCodeService extends ServiceImpl<IoSplitFifoCodeMapper, I
 
     }
 
-    public Boolean isExitCode(String code, String workPlaceCode) {
+    public Boolean isExitCode(String code, Long workPlaceCode) {
         return splitFifoCodeMapper.exists(
                 new LambdaQueryWrapper<IoSplitFifoCodeEntity>()
                         .eq(IoSplitFifoCodeEntity::getCode, code)
-                        .eq(StrUtil.isNotEmpty(workPlaceCode), IoSplitFifoCodeEntity::getWorkPlaceCode, workPlaceCode)
+                        .eq(workPlaceCode != null, IoSplitFifoCodeEntity::getWorkPlaceCode, workPlaceCode)
         );
     }
 
 
-    public IoSplitFifoCodeEntity findByCode(String code, String workPlaceCode) {
+    public IoSplitFifoCodeEntity findByCode(String code, Long workPlaceCode) {
         return splitFifoCodeMapper.selectOne(
                 new LambdaQueryWrapper<IoSplitFifoCodeEntity>()
                         .eq(IoSplitFifoCodeEntity::getCode, code)
-                        .eq(StrUtil.isNotEmpty(workPlaceCode), IoSplitFifoCodeEntity::getWorkPlaceCode, workPlaceCode)
+                        .eq(workPlaceCode != null, IoSplitFifoCodeEntity::getWorkPlaceCode, workPlaceCode)
                         .last("limit 1")
         );
     }
 
+    /**
+     * 库存量提醒
+     * @param workPlaceCode
+     * @return
+     */
+    public String findInvRemind(Long workPlaceCode) {
+        final String[] msg = {"当前工位存量提醒："};
+        SysWorkplace workplace = sysWorkplaceService.getWorkplace(workPlaceCode);
+        if (workplace == null) throw new JsonException("未找到匹配工位");
+        Integer invRemindNumber = workplace.getInvRemindNumber();
+
+        List<IoSplitCodeResponse> invReminds = splitFifoCodeMapper.findInvRemind(workPlaceCode);
+        if (CollUtil.isEmpty(invReminds)){
+            return "当前工位存量提醒：" +"0";
+        }
+        invReminds.forEach( item -> {
+            Integer groupCount = item.getGroupCount();
+            if (groupCount < invRemindNumber){
+                String cpmctymc = item.getCpmctymc();
+                String batchNo = item.getBatchNo();
+                if (StrUtil.isBlank(batchNo)){
+                    msg[0] = msg[0] + cpmctymc + "存量为："+groupCount;
+                }else {
+                    msg[0] = msg[0] + cpmctymc + "["+batchNo+"]存量为："+groupCount;
+                }
+            }
+        });
+
+        return msg[0];
+    }
 
 }

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.44:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://192.168.0.166:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
-    password: root
+    password: 123456
     hikari:
       connection-timeout: 60000
       maximum-pool-size: 20

src/main/resources/mybatis/mapper/auth/SysWorkplaceDao.xml

@@ -8,8 +8,9 @@
     </select>
     <select id="filterList" resultType="com.glxp.api.res.basic.SysWorkplaceResponse">
         select sw.*, aw.name invName,auth_user.employeeName as employeeName,scps.name as categoryName,
-        bcb.code as busTypeCode,bcb.name as busTypeName,bcb.fromType as fromTypeName
+        bcb.code as busTypeCode,bcb.name as busTypeName,bcb.fromType as fromTypeName,ad.name as deptCodeName
         from sys_workplace sw
+                 left join auth_dept ad on sw.deptCode = ad.code
                  left join auth_warehouse aw on sw.invCode = aw.code
                  left join auth_user on sw.chargeUser = auth_user.id
                  left join basic_collect_point_category scps on sw.constituencies = scps.code

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

@@ -15,6 +15,6 @@
                 AND bcb.invCode = #{invCode}
             </if>
         </where>
-        ORDER BY bcb.updateTime desc
+        ORDER BY bcb.sortNumber
     </select>
 </mapper>

src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml

@@ -37,7 +37,7 @@
             <if test="tagStatus != null">
                 AND tagStatus = #{tagStatus}
             </if>
-            <if test="workPlaceCode != null and workPlaceCode != ''">
+            <if test="workPlaceCode != null ">
                 AND workPlaceCode = #{workPlaceCode}
             </if>
             <if test="tagStatusList != null and tagStatusList.size() > 0">

src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml

@@ -30,7 +30,7 @@
             <if test="productType != null">
                 AND productType = #{productType}
             </if>
-            <if test="workPlaceCode != '' and workPlaceCode != null">
+            <if test=" workPlaceCode != null">
                 AND workPlaceCode = #{workPlaceCode}
             </if>
         </where>

src/main/resources/mybatis/mapper/inout/IoSplitFifoCodeMapper.xml

@@ -49,7 +49,7 @@
             <if test="productType != null">
                 AND productType = #{productType}
             </if>
-            <if test="workPlaceCode != '' and workPlaceCode != null">
+            <if test=" workPlaceCode != null">
                 AND workPlaceCode = #{workPlaceCode}
             </if>
         </where>
@@ -96,9 +96,32 @@
             <if test="productType != null">
                 AND productType = #{productType}
             </if>
-            <if test="workPlaceCode != '' and workPlaceCode != null">
+            <if test=" workPlaceCode != null">
                 AND workPlaceCode = #{workPlaceCode}
             </if>
         </where>
     </select>
+
+
+    <select id="findInvRemind" parameterType="long" resultType="com.glxp.api.res.inout.IoSplitCodeResponse">
+        SELECT io_split_fifo_code.*,
+        sum(totalCount) as groupCount,
+        bp.cpmctymc,
+        bp.ggxh,
+        bp.ylqxzcrbarmc,
+        bp.manufactory,
+        bp.measname,
+        bp.zczbhhzbapzbh,
+        bp.ybbm,
+        bp.zxxsdycpbs
+        FROM io_split_fifo_code
+        LEFT JOIN basic_udirel bu ON bu.id = io_split_fifo_code.relId
+        LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
+        <where>
+            <if test=" workPlaceCode != null">
+                AND workPlaceCode = #{workPlaceCode}
+            </if>
+        </where>
+        group by relId, batchNo, workPlaceCode
+    </select>
 </mapper>

src/main/resources/schemas/schema_v2.4.sql

@@ -4210,3 +4210,9 @@ CALL Pro_Temp_ColumnWork('basic_collect_bustype', 'createTime',
 CALL Pro_Temp_ColumnWork('basic_collect_bustype', 'updateTime',
                          ' datetime NULL DEFAULT NULL COMMENT ''更新时间''',
                          1);
+CALL Pro_Temp_ColumnWork('basic_collect_bustype', 'sortNumber',
+                   'int     NULL DEFAULT NULL COMMENT ''排序数字''',
+                         1);
+CALL Pro_Temp_ColumnWork('sys_workplace', 'invRemindNumber',
+                         'int     NULL DEFAULT b''0'' COMMENT ''存量提醒数''',
+                         1);