Merge remote-tracking branch 'origin/dev2.0' into dev2.0

src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java

@@ -188,8 +188,8 @@ public class InvWarehouseController extends BaseController {
             if (!"".equals(invWarehouseEntity.getParentCode())) {
                 invWarehouseEntities1.add(invWarehouseEntity);
             }
-            //领用仓库选择手术室的话，可以领用上一级中心库的产品
+            //领用仓库选择二级仓库的话，可以领用上一级中心库的产品
-            if (filterInvWarehouseRequest.getLocInvCode().equals("1002000") && invWarehouseEntity.getCode().equals("1000000")) {
+            if (!filterInvWarehouseRequest.getLocInvCode().equals("1000000") && invWarehouseEntity.getCode().equals("1000000")) {
                 invWarehouseEntities1.add(invWarehouseEntity);
             }
         }

src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java

@@ -15,6 +15,7 @@ import com.glxp.api.controller.BaseController;
 import com.glxp.api.controller.inv.InvPreProductController;
 import com.glxp.api.controller.inv.InvPreinProductController;
 import com.glxp.api.controller.inv.InvProductController;
+import com.glxp.api.dao.auth.InvWarehouseDao;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.auth.InvWarehouseEntity;
 import com.glxp.api.entity.basic.BasicBusTypeChangeEntity;
@@ -102,6 +103,8 @@ public class PurOrderReceiveController extends BaseController {
     @Resource
     IoPurChangeService purChangeService;
     @Resource
+    InvWarehouseDao invWarehouseDao;
+    @Resource
     InvPreProductController invPreProductController;
     @Resource
     InvPreinProductController invPreinProductController;
@@ -109,7 +112,6 @@ public class PurOrderReceiveController extends BaseController {
     InvProductController invProductController;
 
 
-
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/thrsys/order/insertWeb")
     public BaseResponse addReceive(@RequestBody PurReceiveEntity purReceiveEntity, BindingResult bindingResult) {
@@ -149,6 +151,16 @@ public class PurOrderReceiveController extends BaseController {
     @AuthRuleAnnotation("")
     @GetMapping("/udiwms/receive/order/filter")
     public BaseResponse filterReceive(FilterReceiveRequest filterReceiveRequest) {
+
+        if (filterReceiveRequest.getIsUser() != null && filterReceiveRequest.getIsUser()) {
+            AuthAdmin authAdmin = customerService.getUserBean();
+            filterReceiveRequest.setCreateUser(authAdmin.getId() + ""); //查询自己
+        }
+        if (filterReceiveRequest.getIsInvCode() != null && filterReceiveRequest.getIsInvCode()) {
+            AuthAdmin authAdmin = customerService.getUserBean();
+            filterReceiveRequest.setTargetInvCode(authAdmin.getLocInvCode());
+        }
+
         List<ReceiveResponse> data = receiveService.filterList(filterReceiveRequest);
         PageInfo<ReceiveResponse> pageInfo;
         pageInfo = new PageInfo<>(data);
@@ -235,45 +247,48 @@ public class PurOrderReceiveController extends BaseController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         //判断库存
-        List<InvPreProductResponse> list   = new ArrayList<>();
+        List<InvPreProductResponse> list = new ArrayList<>();
         List<InvPreinProductResponse> listinvprein = new ArrayList<>();
         List<InvProductResponse> listInv = new ArrayList<>();
-        if(updateReceiveDetailRequest.getAdvanceType() == 3){
+        //查询仓库类型
+        InvWarehouseEntity invWarehouseEntity = invWarehouseDao.filterGroupInvSubAndcode(updateReceiveDetailRequest.getTargetInvCode());
+
+        if (invWarehouseEntity.getAdvanceType() == 3) {
             //寄售
             FilterInvPreProductRequest request = new FilterInvPreProductRequest();
-           // BeanUtils.copyProperties(updateReceiveDetailRequest,request);
+            // BeanUtils.copyProperties(updateReceiveDetailRequest,request);
             request.setNameCode(updateReceiveDetailRequest.getNameCode());
             request.setInvCode(updateReceiveDetailRequest.getTargetInvCode());
-             list = selectFilterInvPreProductRequest(request);
+            list = selectFilterInvPreProductRequest(request);
 
-        }else if(updateReceiveDetailRequest.getAdvanceType() == 2){
+        } else if (invWarehouseEntity.getAdvanceType() == 2) {
             //预验收
             FilterInvPreinProductRequest request = new FilterInvPreinProductRequest();
-           // BeanUtils.copyProperties(updateReceiveDetailRequest,request);
+            // BeanUtils.copyProperties(updateReceiveDetailRequest,request);
             request.setNameCode(updateReceiveDetailRequest.getNameCode());
             request.setInvCode(updateReceiveDetailRequest.getTargetInvCode());
-             listinvprein = selectfilterListStock(request);
+            listinvprein = selectfilterListStock(request);
 
-        }else{
+        } else {
             FilterInvProductRequest request = new FilterInvProductRequest();
-           // BeanUtils.copyProperties(updateReceiveDetailRequest,request);
+            // BeanUtils.copyProperties(updateReceiveDetailRequest,request);
             request.setNameCode(updateReceiveDetailRequest.getNameCode());
             request.setInvCode(updateReceiveDetailRequest.getTargetInvCode());
             listInv = selectFilterInvProductRequest(request);
 
         }
-        if(list != null && list.size()>0 ){
+        if (list != null && list.size() > 0) {
-            if( list.get(0).getReCount() < updateReceiveDetailRequest.getCount() ){
+            if (list.get(0).getReCount() < updateReceiveDetailRequest.getCount()) {
                 return ResultVOUtils.error(999, "库存不足！");
             }
         }
-        if(listinvprein != null && listinvprein.size()>0 ){
+        if (listinvprein != null && listinvprein.size() > 0) {
-            if(listinvprein.get(0).getReCount() < updateReceiveDetailRequest.getCount() ){
+            if (listinvprein.get(0).getReCount() < updateReceiveDetailRequest.getCount()) {
                 return ResultVOUtils.error(999, "库存不足！");
             }
         }
-        if(listInv != null && listInv.size()>0 ){
+        if (listInv != null && listInv.size() > 0) {
-            if(listInv.get(0).getReCount() < updateReceiveDetailRequest.getCount() ){
+            if (listInv.get(0).getReCount() < updateReceiveDetailRequest.getCount()) {
                 return ResultVOUtils.error(999, "库存不足！");
             }
         }
@@ -287,7 +302,7 @@ public class PurOrderReceiveController extends BaseController {
         }
     }
 
-    public List<InvPreProductResponse> selectFilterInvPreProductRequest(FilterInvPreProductRequest filterInvPreProductRequest){
+    public List<InvPreProductResponse> selectFilterInvPreProductRequest(FilterInvPreProductRequest filterInvPreProductRequest) {
         if (StrUtil.isNotBlank(filterInvPreProductRequest.getUdiCode())) {
             filterInvPreProductRequest.setNameCode(FilterUdiUtils.getDiStr(filterInvPreProductRequest.getUdiCode()));
         }
@@ -302,7 +317,7 @@ public class PurOrderReceiveController extends BaseController {
         return list;
     }
 
-    public List<InvPreinProductResponse> selectfilterListStock(FilterInvPreinProductRequest filterInvPreinProductRequest){
+    public List<InvPreinProductResponse> selectfilterListStock(FilterInvPreinProductRequest filterInvPreinProductRequest) {
         boolean showSup = false; //前端控制表格显示字段
         if (StrUtil.isNotBlank(filterInvPreinProductRequest.getUdiCode())) {
             filterInvPreinProductRequest.setNameCode(FilterUdiUtils.getDiStr(filterInvPreinProductRequest.getUdiCode()));
@@ -315,12 +330,12 @@ public class PurOrderReceiveController extends BaseController {
             }
         }
 
-        List<InvPreinProductResponse> list  = invPreinProductService.filterListStock(filterInvPreinProductRequest);
+        List<InvPreinProductResponse> list = invPreinProductService.filterListStock(filterInvPreinProductRequest);
 
         return list;
     }
 
-    public List<InvProductResponse> selectFilterInvProductRequest(FilterInvProductRequest filterInvProductRequest){
+    public List<InvProductResponse> selectFilterInvProductRequest(FilterInvProductRequest filterInvProductRequest) {
         boolean showSup = false;  //前端控制表格显示列字段
         if (StrUtil.isNotBlank(filterInvProductRequest.getUdiCode())) {
             filterInvProductRequest.setNameCode(FilterUdiUtils.getDiStr(filterInvProductRequest.getUdiCode()));
@@ -339,8 +354,6 @@ public class PurOrderReceiveController extends BaseController {
     }
 
 
-
-
     @AuthRuleAnnotation("")
     @GetMapping("/udiwms/receive/order/del")
     public BaseResponse del(String orderIdFk) {

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

@@ -37,6 +37,9 @@ public class FilterReceiveRequest extends ListPageRequest {
 
     private Integer type;
     private String orderBy;
+    private Boolean isUser;
+    private Boolean isInvCode;
+    private String createUser;
 
 
 }

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

@@ -18,6 +18,7 @@ public class IoOrderInvoiceRequest  extends ListPageRequest {
 
 
     private String orderIdFk;
+    private String nameCode;
 
 
     private String machineNo;

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

@@ -171,6 +171,8 @@ public class IoOrderDetailBizResponse {
 
     private String checkColdFileName;
 
+    private String zczbhhzbapzbh;
+
 
 
 

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

@@ -15,6 +15,7 @@ public class IoOrderInvoiceResponse {
      * 订单号外键
      */
     private String orderIdFk;
+    private String nameCode;
 
     /**
      * 机器编码

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

@@ -107,7 +107,7 @@ public class InvMAOrderDetailServiceImpl implements InvMAOrderDetailService {
                 invMAOrderDetailEntity.setCreateTime(new Date());
                 invMAOrderDetailDao.insert(invMAOrderDetailEntity);
             } else {
-                return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "当前仓库中不存在此产品，无法进行养护！");
+                return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "当前货位中不存在此产品，无法进行养护！");
             }
         }
         return ResultVOUtils.success("添加库存养护详情成功！");

src/main/resources/application-dev.yml

@@ -4,7 +4,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt?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_wmd?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari:
@@ -50,10 +50,8 @@ file_path: D:/udi/udiwms/udiwmsfile/
 UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df
 UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test
 SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs
-
+SPMS_WEBSOCKET_TOKEN: 07rKFDFkQvBkbxgc7aUBlONo4gWNdx8b
 back_file_path: D:/share/udisps/back/
 API_KEY: 1101
 API_SECRET: zBITspLNvuoEd4FaamlSoqxRHmNsmQ6L
 WEB_TITLE: 平潭协和医院
-
-SPMS_WEBSOCKET_TOKEN: 07rKFDFkQvBkbxgc7aUBlONo4gWNdx8b

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

@@ -2,7 +2,7 @@
 <!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.IoOrderDetailBizDao">
     <select id="filterList" resultType="com.glxp.api.res.inout.IoOrderDetailBizResponse">
-        select io_order_detail_biz.*
+        select io_order_detail_biz.*,bp.zczbhhzbapzbh
         from io_order_detail_biz
                      left join basic_udirel bu on bu.id = io_order_detail_biz.bindRlFk
                      left join basic_products bp on bu.uuid = bp.uuid

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

@@ -91,6 +91,7 @@
             resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse">
         SELECT
         ic.id,
+        bp.nameCode,
         ic.orderIdFk,
         ic.bindRlFk,
         ic.batchNo,

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

@@ -28,6 +28,9 @@
             <if test="invCode != null and invCode != ''">
                 AND invCode = #{invCode}
             </if>
+            <if test="createUser != '' and createUser != null">
+                AND io.createUser = #{createUser}
+            </if>
             <if test="targetInvCode != null and targetInvCode != ''">
                 AND targetInvCode = #{targetInvCode}
             </if>

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

@@ -148,13 +148,14 @@
     </select>
 
     <select id="getMAInvProducts" resultType="com.glxp.api.res.inv.InvProductResponse">
-        select ip.id, bp.nameCode, bp.cpmctymc, bp.ggxh, ip.batchNo, ip.productionDate, ip.expireDate
+        select ip.id, bp.nameCode, bp.cpmctymc, bp.ggxh, ip.batchNo, ip.productionDate, ip.expireDate,basic_corp.name supName
         from inv_product ip
         left join inv_product_detail ipd
         on ip.relIdFk = ipd.relId and
         ifnull(ip.batchNo, 'empty') = ifnull(ipd.batchNo, 'empty')
         left join basic_udirel bu on bu.id = ip.relIdFk
         left join basic_products bp on bu.uuid = bp.uuid
+        left join basic_corp on ip.supId = basic_corp.erpId
         <where>
             (ip.inCount - ip.outCount) > 0
             <if test="nameCode != null and nameCode != ''">
@@ -202,6 +203,9 @@
             <if test="invSpaceCode != null and invSpaceCode != ''">
                 AND ipd.invSpaceCode = #{invSpaceCode}
             </if>
+<!--            <if test="supId != null and supId != ''">-->
+<!--                AND ipd.supId = #{supId}-->
+<!--            </if>-->
         </where>
         group by ip.id
     </select>

src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml

@@ -4,7 +4,7 @@
     <select id="selectSupRemindMsgList" resultType="com.glxp.api.res.purchase.SupCertRemindMsgResponse">
         select m.*,
                c.companyName                                                                   `name`,
-               (select `name` from sup_cert s where s.code = m.code and s.CustomerId = m.idFk) certName
+               (select `name` from sup_cert s where s.code = m.code and s.CustomerId = m.idFk limit 1) certName
         from sup_cert_remind_msg m
                  left join sup_company c on m.idFk = c.customerId
         <where>
@@ -27,9 +27,9 @@
     <select id="selectManufactureRemindMsgList" resultType="com.glxp.api.res.purchase.SupCertRemindMsgResponse">
         select m.*,
                c.companyName                                                                   `name`,
-               (select `name` from sup_cert s where s.code = m.code and s.manufacturerIdFk = m.idFk) certName
+               (select `name` from sup_cert s where s.code = m.code and s.manufacturerIdFk = m.idFk limit 1) certName
         from sup_cert_remind_msg m
-                 left join sup_manufacturer c on m.idFk = c.customerId
+                 left join sup_manufacturer c on m.idFk = c.manufacturerId
         <where>
             <if test="name != null and name != ''">
                 AND c.companyName like concat('%', #{name}, '%')
@@ -69,4 +69,4 @@
         </where>
         order by m.updateTime desc
     </select>
-</mapper>
+</mapper>

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

@@ -132,3 +132,7 @@ CREATE TABLE IF NOT EXISTS `sync_edit_type`
   ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;
+
+# INSERT ignore INTO `auth_menu`(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (20100, '我的申购单 ', 1674, 2, 'purchase/purApply/pureApplyMySearch', 'purchase/purApply/pureApplyMySearch', NULL, 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2023-07-20 17:08:38', NULL, NULL, NULL);
+# INSERT ignore INTO `auth_menu`(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2000, '我的申购单 ', 1674, 2, 'purchase/purApply/pureApplyMySearch', 'purchase/purApply/pureApplyMySearch', NULL, 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2023-07-20 17:08:38', NULL, NULL, NULL);
+#