修改bug

api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java

@@ -588,6 +588,7 @@ public class UdiRelevanceController {
                     BasicProductThirdSysResponse basicProductThirdSysResponse = new BasicProductThirdSysResponse();
                     basicProductThirdSysResponse.setThirdId(udiRelevanceEntity.getThirdId());
                     basicProductThirdSysResponse.setThirdName(udiRelevanceEntity.getThirdName());
+                    basicProductThirdSysResponse.setRelId(udiRelevanceEntity.getId());
                     basicProductThirdSysResponse.setSysName(basicThirdSysEntity.getThirdName());
                     basicProductThirdSysResponse.setSysId(basicThirdSysEntity.getThirdId());
                     if (udiRelevanceEntity.getThirdId() != null && !udiRelevanceEntity.getThirdId().isEmpty()) {

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java

@@ -660,8 +660,10 @@ public class OrderDetailController {
                 OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
                 orderFilterRequest.setErpFk(erpOrderResponse.getBillNo());
                 List<OrderEntity> orderEntities = orderService.findAllOrders(orderFilterRequest);
-                if (CollUtil.isNotEmpty(orderEntities)) {
-                    return orderEntities.get(0);
+                for(OrderEntity obj:orderEntities){
+                    if(!obj.getErpFk().equals(erpOrderResponse.getBillNo())){
+                        return obj;
+                    }
                 }
             }
         }

api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupManufacturerController.java

@@ -315,6 +315,44 @@ public class SupManufacturerController {
         if (StrUtil.isEmpty(supManufacturerEntity.getManufacturerId()) || StrUtil.isEmpty(supManufacturerEntity.getCustomerId())) {
             return ResultVOUtils.error(500, "参数错误！");
         }
+
+        //验证证书是否齐全
+        FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest();
+        filterCertSetsRequest.setType(ConstantStatus.CERT_MANUFACTURER);
+        List<SupCertSetEntity> supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest);
+        ListIterator<SupCertSetEntity> iterable = supCertSetEntities.listIterator();
+        while (iterable.hasNext()) {
+            SupCertSetEntity supCertSetEntity = iterable.next();
+
+            if ((           supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 2
+                    && StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2"))
+                    ||
+                    (
+                            supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 1
+                                    && StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2"))
+                    ||
+                    (       supCertSetEntity.getForeign() != null
+                            && supCertSetEntity.getForeign() == 1
+                            && supManufacturerEntity.getCompanyType().equals("1"))
+                    ||
+                    (       supCertSetEntity.getForeign() != null
+                            && supCertSetEntity.getForeign() == 3
+                            && supManufacturerEntity.getCompanyType().equals("1"))) {
+            } else {
+                iterable.remove();
+            }
+
+
+        }
+        String errMsg = "";
+        if (supCertSetEntities.size() > 0) {
+            for (SupCertSetEntity supCertSetEntity : supCertSetEntities) {
+                errMsg = errMsg + "," + supCertSetEntity.getName();
+            }
+            return ResultVOUtils.error(500, errMsg.substring(1) + "等证书未上传，无法完成审核！");
+        }
+
+
         //  查询是否包含审核未通过的证书
         if (supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS ||
                 supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS) {

api-admin/src/main/java/com/glxp/sale/admin/res/basic/BasicProductThirdSysResponse.java

@@ -11,4 +11,5 @@ public class BasicProductThirdSysResponse {
     private String spec;
     private String registerNo;
     private String manufactory;
+    private String relId;
 }

api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml

@@ -121,11 +121,10 @@
         SELECT
         inv_prein_product.id,
         basic_products.cpmctymc,basic_products.nameCode,inv_prein_product.relIdFk,basic_products.ggxh,
-        inv_prein_product.batchNo
-        ,inv_prein_product.productionDate,inv_prein_product.expireDate,
+        inv_prein_product.batchNo,inv_prein_product.productionDate,inv_prein_product.expireDate,
         basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,
-        sum(inv_prein_product.inCount) as inCount,sum(inv_prein_product.outCount) as outCount,
-        sum(inv_prein_product.reCount) as reCount,inv_prein_product.customerId,
+        inv_prein_product.inCount,inv_prein_product.outCount,
+        inv_prein_product.reCount,inv_prein_product.customerId,
         basic_corp.name companyName,inv_prein_product.supId,inv_prein_product.unitFk ,inv_warehouse.name
         invStorageName,inv_prein_product.invStorageCode,inv_prein_product.price, inv_warehouse_sub.name
         invSubStorageName,inv_prein_product.invWarehouseCode,inv_prein_product.orderIdFk
@@ -202,7 +201,6 @@
         <if test="groupType != '' and groupType != null">
             GROUP BY #{groupType}
         </if>
-        group by inv_prein_product.orderIdFk
         order by inv_prein_product.updateTime desc
     </select>
     <insert id="insertInvProduct" keyProperty="id"

api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDetailDao.xml

@@ -7,6 +7,9 @@
             resultType="com.glxp.sale.admin.entity.inventory.InvProductDetailEntity">
         SELECT * FROM inv_prein_product_detail
         <where>
+            <if test="id != '' and id != null">
+                AND id = #{id}
+            </if>
             <if test="productIdFk != '' and productIdFk != null">
                 AND productIdFk = #{productIdFk}
             </if>