四级库库存查询

src/main/java/com/glxp/api/constant/Constant.java

@@ -280,6 +280,13 @@ public class Constant {
 
     public static final String ORDER_STATUS_INCODE = "supInCode";
 
+
+    /**
+     * 单据--拆零预出库新增扫码单据标识
+     */
+    public static final String ORDER_STATUS_SPLIT_FINISH_CODEE = "split_finish";
+
+
     /**前端页面查询相关单据类型标识*/
 
 
@@ -308,6 +315,7 @@ public class Constant {
     public static final String ORDER_ACTION_WAIT_DEAL = "waitDeal";     //待配货/拣货
     public static final String ORDER_THIRD_UPLOAD = "thirdUpload";
     public static final String ORDER_THIRD_STOCK = "stock";    //内部码
+    public static final String ORDER_ACTION_SPLIT = "splitOrder";       //拆零页面
 
     public static final String SYNC_REMARK = "syncRemark";
 

src/main/java/com/glxp/api/controller/basic/BasicSickerController.java

@@ -13,6 +13,7 @@ import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.basic.BasicSkSickerEntity;
 import com.glxp.api.http.ErpBasicClient;
 import com.glxp.api.req.basic.BasicSkSickerRequest;
+import com.glxp.api.req.basic.GetSickPrescribeRequest;
 import com.glxp.api.req.basic.GetSickRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.basic.BasicSkSickerResponse;
@@ -99,6 +100,17 @@ public class BasicSickerController extends BaseController {
     }
 
 
+    /**
+     * 在线实时获取处方信息
+     *
+     * @return
+     */
+    @GetMapping("/udiwms/basic/sk/sicker/prescribe/filter/onLine")
+    public BaseResponse filterSickerPrescribeOnLine(GetSickPrescribeRequest getSickRequest) {
+        return erpBasicClient.getSickPrescribe(getSickRequest);
+    }
+
+
     @CusRedissonAnnotation(cacheName = RedissonCacheKey.DL_SICKER, key = {"#getSickRequest.thirdSys"}, waitTime = 3, timeOutMsg = "后台正在下载，请勿重复提交")
     @PostMapping("/udiwms/basic/sk/sicker/download")
     public BaseResponse sickerDl(@RequestBody GetSickRequest getSickRequest, BindingResult bindingResult) {

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

@@ -777,10 +777,10 @@ public class IoCodeTempController extends BaseController {
                 orderEntity.setOrderType(addOrderRequest.getOrderType());
                 orderEntity.setBusType(bussinessTypeEntity.getBusType());
                 orderEntity.setSickerAdNum(addOrderRequest.getSickerAdNum());
+                orderEntity.setWorkPlaceCode(addOrderRequest.getWorkPlaceCode());
                 orderService.insertOrder(orderEntity);
             }
 
-
             if (IntUtil.value(addOrderRequest.getOrderType()) == ConstantStatus.ORDER_TYPE_NORMAL && bussinessTypeEntity.isCheckEnable() && bussinessTypeEntity.getCheckWebNew() != 0) {
 
                 boolean isBillExit = orderDetailBizService.isExit(orderEntity.getBillNo());

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

@@ -43,4 +43,6 @@ public class AddOrderRequest {
     private String preInPrice;
     private String preInBatchNo;
     private String sickerAdNum;
+
+    private String workPlaceCode;
 }

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

@@ -270,6 +270,10 @@ public class IoOrderResponse {
      * 工位代码
      */
     private String workPlaceCode;
+    /**
+     * 工位名称
+     */
+    private String workPlaceName;
 
     public String getFromName() {
 

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

@@ -1,5 +1,6 @@
 package com.glxp.api.res.inout;
 
+import com.glxp.api.entity.basic.BasicProductsEntity;
 import lombok.Data;
 
 import java.util.Date;
@@ -132,4 +133,15 @@ public class IoSplitCodeResponse {
 
     private Integer groupCount;
 
+    //产品信息----------------------------start----------------------
+    private String cpmctymc;
+    private String ggxh;
+    private String ylqxzcrbarmc;
+    private String manufactory;
+    private String measname;
+    private String zczbhhzbapzbh;
+    private String ybbm;
+    private String zxxsdycpbs;
+
+
 }

src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java

@@ -340,6 +340,14 @@ public class BasicBussinessTypeServiceImpl extends ServiceImpl<BasicBussinessTyp
                 }
                 break;
 
+            //科室拆零预出库界面
+            case Constant.ORDER_ACTION_SPLIT:
+                bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
+                        .eq("enable", true).and(
+                                webNew -> webNew.in("action", "SC72197936495755", "SC72249388338364")
+                        )
+                );
+                break;
             default:
                 break;
         }

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

@@ -1190,7 +1190,22 @@ public class IoCheckInoutService {
                 genInvService.genNorInv(orderEntity.getBillNo());
                 orderService.updateOrderInventory(orderEntity.getBillNo(), orderEntity.getStatus());
                 //若未拆零预出库单据则进入到拆零队列
-                if (orderEntity.getAction() == "SC72197936495755") {
+                if (orderEntity.getAction().equals("SC72197936495755")) {
+                    List<IoCodeEntity> codeList = codeService.findByOrderId(orderEntity.getBillNo());
+                    List<IoSplitFifoCodeEntity> splitCodeEntities = new ArrayList<>();
+                    if (CollUtil.isNotEmpty(codeList)) {
+                        for (IoCodeEntity codeEntity : codeList) {
+                            IoSplitFifoCodeEntity splitCodeEntity = new IoSplitFifoCodeEntity();
+                            BeanUtils.copyProperties(codeEntity, splitCodeEntity);
+                            splitCodeEntity.setInBactchNo(codeEntity.getInBatchNo());
+                            splitCodeEntity.setTotalCount(codeEntity.getReCount());
+                            splitCodeEntity.setId(null);
+                            splitCodeEntities.add(splitCodeEntity);
+                        }
+                    }
+                    splitFifoCodeService.saveBatch(splitCodeEntities);
+                } else if (orderEntity.getAction().equals("SC72249388338364")) {
+                    //拆零预出库退回
                     List<IoCodeEntity> codeList = codeService.findByOrderId(orderEntity.getBillNo());
                     List<IoSplitFifoCodeEntity> splitCodeEntities = new ArrayList<>();
                     if (CollUtil.isNotEmpty(codeList)) {

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -715,6 +715,7 @@ public class IoOrderServiceImpl implements IoOrderService {
                 filterOrderRequest.setDealStatuses(Arrays.asList(2));
                 break;
             case Constant.ORDER_STATUS_AUDITED:
+            case Constant.ORDER_STATUS_SPLIT_FINISH_CODEE:
                 filterOrderRequest.setStatuses(Arrays.asList(7));
                 filterOrderRequest.setDealStatuses(Arrays.asList(3, 4));
                 break;
@@ -739,6 +740,7 @@ public class IoOrderServiceImpl implements IoOrderService {
             case Constant.ORDER_STATUS_UN_ALLOCATE:
                 filterOrderRequest.setStatuses(Arrays.asList(ConstantStatus.ORDER_STATUS_ALLOCATE));
                 filterOrderRequest.setDealStatuses(Arrays.asList(2));
+                break;
             default:
                 break;
         }

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

@@ -2,22 +2,47 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.inout.IoOrderDao">
     <select id="filterList" resultType="com.glxp.api.res.inout.IoOrderResponse">
-        select io.*,
-               (select name from basic_bussiness_type bus where bus.action = io.action) billTypeName,
-               (select name from auth_dept ad where ad.code = io.deptCode)              deptName,
-               (select name from auth_warehouse aw where aw.code = io.invCode)          invName,
-               (select employeeName from auth_user au where au.id = io.createUser)      createUserName,
-               (select employeeName from auth_user au2 where au2.id = io.updateUser)    updateUserName,
-               (select employeeName from auth_user au3 where au3.id = io.reviewUser)    reviewUserName,
-               (select employeeName from auth_user au4 where au4.id = io.checkUser)     checkUserName,
-               (select name from auth_dept ad2 where ad2.code = io.fromDeptCode)        fromDeptName,
-               (select name from auth_warehouse aw2 where aw2.code = io.fromInvCode)    fromInvName,
-               (select name from basic_corp bc where bc.erpId = io.fromCorp)            fromCorpName,
-               (select name from basic_corp bc where bc.erpId = io.customerId)          customerName
-                from io_order as io
-                left join auth_warehouse aw on aw.code = io.fromInvCode
-                left join basic_corp bc on bc.erpId = io.fromCorp
-                left join io_order_invoice ioi on ioi.orderIdFk = io.billNo
+        SELECT io.*,
+               bus.name         AS billTypeName,
+               ad.name          AS deptName,
+               aw.name          AS invName,
+               au.employeeName  AS createUserName,
+               au2.employeeName AS updateUserName,
+               au3.employeeName AS reviewUserName,
+               au4.employeeName AS checkUserName,
+               ad2.name         AS fromDeptName,
+               aw2.name         AS fromInvName,
+               bc1.name         AS fromCorpName,
+               bc2.name         AS customerName,
+               sw.workplaceName AS workPlaceName
+                FROM
+                io_order io
+                LEFT JOIN
+                basic_bussiness_type bus ON bus.action = io.action
+                LEFT JOIN
+                auth_dept ad ON ad.code = io.deptCode
+                LEFT JOIN
+                auth_warehouse aw ON aw.code = io.invCode
+                LEFT JOIN
+                auth_user au ON au.id = io.createUser
+                LEFT JOIN
+                auth_user au2 ON au2.id = io.updateUser
+                LEFT JOIN
+                auth_user au3 ON au3.id = io.reviewUser
+                LEFT JOIN
+                auth_user au4 ON au4.id = io.checkUser
+                LEFT JOIN
+                auth_dept ad2 ON ad2.code = io.fromDeptCode
+                LEFT JOIN
+                auth_warehouse aw2 ON aw2.code = io.fromInvCode
+                LEFT JOIN
+                basic_corp bc1 ON bc1.erpId = io.fromCorp
+                LEFT JOIN
+                basic_corp bc2 ON bc2.erpId = io.customerId
+                LEFT JOIN
+                io_order_invoice ioi ON ioi.orderIdFk = io.billNo
+                LEFT JOIN
+                sys_workplace sw ON sw.workplaceId = io.workPlaceCode
 
         <if test="uploadKey != null and uploadKey != ''">
             INNER JOIN io_unit_maintain_platform a2 on io.action = a2.sourceAction AND io.fromCorp = a2.unitId

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

@@ -3,8 +3,18 @@
 <mapper namespace="com.glxp.api.dao.inout.IoSplitFifoCodeMapper">
     <select id="filterList" parameterType="com.glxp.api.req.inout.IoSplitFifoCodeRequest"
             resultType="com.glxp.api.res.inout.IoSplitCodeResponse">
-        SELECT io_split_fifo_code.*, sum(totalCount) as groupCount
+        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="code != '' and code != null">
                 AND code LIKE #{code}

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

@@ -3927,6 +3927,9 @@ CALL Pro_Temp_ColumnWork('basic_products', 'medicareType',
 CALL Pro_Temp_ColumnWork('basic_products', 'indate',
                          ' datetime NULL DEFAULT NULL COMMENT ''有效日期''',
                          1);
+CALL Pro_Temp_ColumnWork('basic_products', 'zxxsdycpbs',
+                         'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''最小销售产品标识''',
+                         1);