Merge branch 'dev' 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/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/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/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>