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

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

@@ -1027,7 +1027,9 @@ public class IoCodeTempController extends BaseController {
         for (int i = 0; i < codeEnttityList.size(); i++) {
             IoCodeTempEntity drugCodeSelectEntity = codeEnttityList.get(i);
             if (codeEnttityList.get(i).getCode().equals(code)) {
-                return drugCodeSelectEntity;
+                if (StrUtil.emptyIfNull(drugCodeSelectEntity.getSerialNo()).equals(StrUtil.emptyIfNull(udiEntity.getSerialNo()))) {
+                    return drugCodeSelectEntity;
+                }
             }
 //            UdiEntity originUdiEntity = FilterUdiUtils.getUdi(drugCodeSelectEntity.getCode());
             if (!StrUtil.emptyIfNull(drugCodeSelectEntity.getNameCode()).equals(StrUtil.emptyIfNull(udiEntity.getUdi()))) {

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

@@ -50,8 +50,7 @@ public class IoCodeTempEntity {
      */
     @TableField(value = "nameCode")
     private String nameCode;
-    private String fromCorpName;
-    private String fromName;
+
 
     /**
      * 批次号

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

@@ -12,8 +12,8 @@
         basic_products.measname,
         basic_products.manufactory
         FROM inv_inner_order_detail
-        INNER JOIN basic_udirel on inv_inner_order_detail.productId = basic_udirel.id
-        INNER JOIN basic_products on basic_udirel.uuid = basic_products.uuid
+        left JOIN basic_udirel on inv_inner_order_detail.productId = basic_udirel.id
+        left JOIN basic_products on basic_udirel.uuid = basic_products.uuid
         <where>
             <if test="orderIdFk != '' and orderIdFk != null">
                 AND orderIdFk = #{orderIdFk}
@@ -22,7 +22,7 @@
                 AND productId = #{productId}
             </if>
         </where>
-        GROUP BY basic_products.uuid
+        group by inv_inner_order_detail.id
     </select>
 
     <insert id="insert" keyProperty="id"
@@ -107,6 +107,9 @@
             <if test="batchNo != '' and batchNo != null">
                 AND batchNo = #{batchNo}
             </if>
+            <if test="batchNo == '' or batchNo == null">
+                AND (batchNo is null or batchNo = '')
+            </if>
         </where>
 
     </select>