修改bug

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

@@ -312,8 +312,12 @@ public class UdiRelevanceController {
         udiInfoEntity.setMeasname(udiRelevanceResponse.getMeasname());
         udiInfoEntity.setManufactory(udiRelevanceResponse.getManufactory());
         udiInfoEntity.setCpms(udiRelevanceResponse.getCpms());
+//        udiInfoEntity.setDiType(udiRelevanceResponse.getDiType());
         udiInfoEntity.setPrice(udiRelevanceResponse.getPrice());
         udiInfoEntity.setSpmc(udiRelevanceResponse.getSpmc());
+        udiInfoEntity.setAllowNoBatch(udiRelevanceResponse.isAllowNoBatch());
+        udiInfoEntity.setAllowNoExpire(udiRelevanceResponse.isAllowNoExpire());
+        udiInfoEntity.setAllowNoProduct(udiRelevanceResponse.isAllowNoProduct());
         udiInfoEntity.setBasicPrductRemak1(udiRelevanceResponse.getBasicPrductRemak1());
         udiInfoEntity.setBasicPrductRemak2(udiRelevanceResponse.getBasicPrductRemak2());
         udiInfoEntity.setBasicPrductRemak3(udiRelevanceResponse.getBasicPrductRemak3());

api-admin/src/main/java/com/glxp/sale/admin/dao/thrsys/ThrProductsAddDiDao.java

@@ -36,4 +36,5 @@ public interface ThrProductsAddDiDao {
 
     /** 根据ID查询 */
     ThrProductsAddDiEntity filterThrProductsGetId(@Param("id") Integer id);
+    ThrProductsAddDiEntity filterThrProductsGetUuid(@Param("uuid") String uuid);
 }

api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiInfoEntity.java

@@ -30,7 +30,7 @@ public class UdiInfoEntity {
     private String sydycpbs;
     private String uuid;
     private int versionNumber;
-    private int diType;
+    private Integer diType;
     private String thirdId;
     private String thirdName;
     private String ybbm;
@@ -308,11 +308,11 @@ public class UdiInfoEntity {
         this.versionNumber = versionNumber;
     }
 
-    public int getDiType() {
+    public Integer getDiType() {
         return diType;
     }
 
-    public void setDiType(int diType) {
+    public void setDiType(Integer diType) {
         this.diType = diType;
     }
 

api-admin/src/main/java/com/glxp/sale/admin/req/basic/BusTypeChangeFilterRequest.java

@@ -8,4 +8,6 @@ public class BusTypeChangeFilterRequest extends ListPageRequest {
 
     private String action;
     private String originAction;
+    private String originName;
+    private String targetName;
 }

api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterUdiInfoRequest.java

@@ -60,4 +60,6 @@ public class FilterUdiInfoRequest extends ListPageRequest {
     private String originUuid;
     private String relId;
 
+    private String companyName;
+
 }

api-admin/src/main/java/com/glxp/sale/admin/req/purchase/PurApplyRequest.java

@@ -105,5 +105,7 @@ public class PurApplyRequest extends ListPageRequest {
 
     private boolean audtoPlan;
 
+    private Integer applyType;
+
 
 }

api-admin/src/main/java/com/glxp/sale/admin/res/purchase/PurApplyResponse.java

@@ -3,6 +3,7 @@ package com.glxp.sale.admin.res.purchase;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 @Data
 public class PurApplyResponse {
@@ -76,4 +77,6 @@ public class PurApplyResponse {
     private String planBillNo;      //生成采购计划单据号
 
     private boolean audtoPlan;
+
+
 }

api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrProductsAddDiServiceImpl.java

@@ -95,7 +95,13 @@ public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService {
 
     @Override
     public UdiInfoEntity getDiProductDetail(String uuid) {
-        return thrProductsAddDiDao.getDiProductDetail(uuid);
+       ThrProductsAddDiEntity thrProductsAddDiEntity=thrProductsAddDiDao.filterThrProductsGetUuid(uuid);
+       UdiInfoEntity udiInfoEntity=thrProductsAddDiDao.getDiProductDetail(uuid);
+       udiInfoEntity.setSptm(thrProductsAddDiEntity.getSptm());
+       udiInfoEntity.setYbbm(thrProductsAddDiEntity.getYbbm());
+       udiInfoEntity.setManufactory(thrProductsAddDiEntity.getManufactory());
+       udiInfoEntity.setCpms(thrProductsAddDiEntity.getCpms());
+       return udiInfoEntity;
     }
 
     @Override

api-admin/src/main/java/com/glxp/sale/admin/thread/CompanyProductsRelService.java

@@ -45,6 +45,8 @@ public class CompanyProductsRelService {
                     BeanUtils.copyProperties(udiInfoExportRequest.getSupplementRequest(), udiInfoEntity);
                     BeanUtils.copyProperties(supplementRequest, udiRelevanceEntity);
                     udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
+                    udiInfoEntity.setDiType(null);
+                    udiInfoEntity.setPackLevel(null);
                     udiInfoService.updateUdiInfo(udiInfoEntity);
                     companyProductRelevanceEntity.setCreate_time(new Date());
                     companyProductRelevanceEntity.setUpdate_time(new Date());

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

@@ -32,6 +32,12 @@
             <if test="action != ''and action != null">
                 AND basic_bustype_pre.`action` = #{action}
             </if>
+            <if test="originName != ''and originName != null">
+                AND busTypeA.NAME LIKE CONCAT(#{originName},'%')
+            </if>
+            <if test="targetName != ''and targetName != null">
+                AND busTypeB.name LIKE CONCAT(#{targetName},'%')
+            </if>
             <if test="originAction != ''and originAction != null">
                 AND basic_bustype_pre.`originAction` = #{originAction}
             </if>

api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml

@@ -221,7 +221,8 @@
             </if>
         </where>
         group by stock_order.id
-        ORDER BY updateTime DESC
+        ORDER BY stock_order.billdate DESC
+
 
     </select>
 

api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml

@@ -47,6 +47,9 @@
             <if test="createBy != '' and createBy != null">
                 AND createBy = #{createBy}
             </if>
+            <if test="applyType != null">
+                AND generatePlan = 1
+            </if>
         </where>
 
     </select>

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

@@ -78,6 +78,13 @@
         where id = #{id}
     </select>
 
+    <select id="filterThrProductsGetUuid" parameterType="string"
+            resultType="com.glxp.sale.admin.entity.thrsys.ThrProductsAddDiEntity">
+        select *
+        from thr_products_add_di
+        where uuid = #{uuid}
+    </select>
+
 
     <select id="filterThrProductsList" parameterType="com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest"
             resultType="com.glxp.sale.admin.res.thrsys.ThrProductsAddDiResponse">