Merge remote-tracking branch 'origin/orderChange' into zhairh

# Conflicts:
#	api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java

api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java

@@ -90,7 +90,7 @@ public class ThrProductsAddController {
         }
 
         ThrProductsAddEntity tempEntity = thrProductsAddService.selectById(thrProductsAddEntity.getId() + "");
-        if (thrProductsService.isExit(tempEntity.getCode(), tempEntity.getThirdSysFk())) {
+        if (!thrProductsService.isExit(tempEntity.getCode(), tempEntity.getThirdSysFk())) {
             return ResultVOUtils.error(500, "已存在相同产品编码，无法添加！");
         }
         thrProductsAddService.updateThrProducts(thrProductsAddEntity);

api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddDiController.java

@@ -90,10 +90,6 @@ public class ThrProductsAddDiController {
             FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
             filterUdiInfoRequest.setNameCode(filterThrProductsRequest.getCode());
             List<UdiRelevanceResponse> temps = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
-            if (temps != null && temps.size() > 0) {
-                filterThrProductsRequest.setUuid(temps.get(0).getUuid());
-                filterUdiInfoRequest.setNameCode(null);
-            }
         }
         filterThrProductsRequest.setDiType(1);
         List<ThrProductsAddDiResponse> thrProductsAddDiResponses = thrProductsAddDiService.filterThrProductsList(filterThrProductsRequest);

api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsController.java

@@ -99,7 +99,7 @@ public class ThrProductsController {
                 filterUdiInfoRequest.setThirdId(thrProductsEntity.getCode());
             }
             List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
-            if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) {
+            if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 1) {
                 return "该产品已与UDI码关联，无法删除！";
             }
         }

api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrProductsRequest.java

@@ -28,4 +28,5 @@ public class FilterThrProductsRequest extends ListPageRequest {
     private Long id;
     private String uuid;
     private Integer diType;
+    private String companyName;
 }

api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -50,7 +50,7 @@
                 AND nameCode LIKE concat(#{nameCode},'%')
             </if>
             <if test="thirdId != '' and thirdId != null">
-                AND thirdId LIKE concat(#{thirdId},'%')
+                AND thirdId LIKE #{thirdId}
             </if>
             <if test="uuid != '' and uuid != null">
                 AND basic_udirel.uuid = #{uuid}

api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDao.xml

@@ -7,6 +7,7 @@
             resultType="com.glxp.sale.admin.entity.thrsys.ThrProductsAddEntity">
         SELECT thr_products_add.*,basic_corp.name corpName FROM thr_products_add
         left join basic_corp on thr_products_add.customerId = basic_corp.erpId
+        left join company on company.customerid=thr_products_add.customerid
         <where>
             <if test="name != '' and name != null">
                 AND thr_products_add.name LIKE concat('%',#{name},'%')
@@ -41,6 +42,9 @@
             <if test="customerId != '' and customerId != null">
                 AND customerId = #{customerId}
             </if>
+            <if test="companyName != '' and companyName != null">
+                AND companyName = #{companyName}
+            </if>
 
         </where>
         group by thr_products_add.id

api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml

@@ -96,6 +96,7 @@
         p.zczbhhzbapzbh
         FROM thr_products_add_di tdi
         LEFT JOIN productinfo p ON tdi.uuid = p.uuid
+        LEFT JOIN company c on c.customerId=tdi.customerId
         <where>
             <if test="checkStatus != null">
                 AND tdi.status = #{checkStatus}
@@ -124,6 +125,9 @@
             <if test="diType != '' and diType != null">
                 AND p.diType = #{diType}
             </if>
+            <if test="companyName != '' and companyName != null">
+            AND c.companyName = #{companyName}
+        </if>
         </where>
         order by tdi.createTime DESC