同步管理系统1.0问题

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

@@ -299,7 +299,7 @@ public class UdiRelevanceController {
         }
 
         //判断父id不为空就吧值给到id里面防止id变成详情id
-        if (udiRelevanceResponse.getPid() != null) {
+        if (udiRelevanceResponse.getPid() != null && udiRelevanceResponse.getPid()!=0) {
             udiRelevanceResponse.setId(udiRelevanceResponse.getPid());
         }
         //更新关联表相关信息
@@ -688,7 +688,7 @@ public class UdiRelevanceController {
     @GetMapping("/udiwms/udirl/di/remove")
     public BaseResponse removeDI(RemoveRelRequest removeRelRequest) {
         UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(removeRelRequest.getRelId());
-        if (StrUtil.isEmpty(udiRelevanceEntity.getMainId())) {
+        if (udiRelevanceEntity==null || StrUtil.isEmpty(udiRelevanceEntity.getMainId())) {
             return ResultVOUtils.error(500, "未关联第三方产品ID，无法解除绑定！");
         }
         List<UdiRelevanceResponse> temps = udiRelevanceService.selectByMainId(udiRelevanceEntity.getMainId());

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

@@ -57,6 +57,8 @@ public class UdiInfoEntity {
     private String relId;//关联ID主键
     private Integer status;
     private String supId;
+    private boolean isAdavence;
+    private boolean isDisable;
 
     private Boolean isCheck;
     private boolean allowNoBatch;

api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java

@@ -67,4 +67,8 @@ public interface WarehouseUserService {
      * @return
      */
     Integer countUserBySubInvCode(String subInvCode);
+
+    /** 查询出取消的用户 ...*/
+    List<WarehouseUserEntity> getNotWarehouseUserList(FilterInvLinkDataRequest filterInvLinkDataRequest);
+
 }

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

@@ -5,25 +5,100 @@
 
     <select id="filterUdiInfo" parameterType="com.glxp.api.admin.req.basic.FilterUdiInfoRequest"
             resultType="com.glxp.api.admin.entity.basic.UdiInfoEntity">
-        SELECT * FROM basic_products
+        SELECT
+        basic_products.id,
+        basic_products.nameCode,
+        basic_products.packRatio,
+        basic_products.packLevel,
+        basic_products.bhxjsl,
+        basic_products.bhzxxsbzsl,
+        basic_products.zxxsbzbhsydysl,
+        basic_products.bhxjcpbm,
+        basic_products.bzcj,
+        basic_products.addType,
+        basic_products.deviceRecordKey,
+        basic_products.cpmctymc,
+        basic_products.cplb,
+        basic_products.flbm,
+        basic_products.ggxh,
+        basic_products.qxlb,
+        basic_products.tyshxydm,
+        basic_products.ylqxzcrbarmc,
+        basic_products.zczbhhzbapzbh,
+        basic_products.ylqxzcrbarywmc,
+        basic_products.sydycpbs,
+        basic_products.uuid,
+        basic_products.sjcpbm,
+        basic_products.versionNumber,
+        basic_products.diType,
+        basic_products.manufactory,
+        basic_products.productType,
+        basic_products.scbssfbhph,
+        basic_products.scbssfbhxlh,
+        basic_products.scbssfbhscrq,
+        basic_products.scbssfbhsxrq,
+        basic_products.cpms,
+        basic_products.originUuid,
+        basic_products.allowNoBatch,
+        basic_products.allowNoExpire,
+        basic_products.allowNoProduct,
+        basic_products.spmc,
+        basic_products.cplx,
+        basic_products.hchzsb,
+        basic_products.cpdls,
+        basic_products.basicPrductRemak1,
+        basic_products.basicPrductRemak2,
+        basic_products.basicPrductRemak3,
+        basic_products.basicPrductRemak4,
+        basic_products.basicPrductRemak5,
+        basic_products.basicPrductRemak6,
+        basic_products.basicPrductRemak7,
+        basic_products.basicPrductRemak8,
+        basic_udirel.thirdId,
+        basic_udirel.thirdName,
+        basic_udirel.isUseDy,
+        basic_udirel.updateTime,
+        basic_udirel.thirdId1,
+        basic_udirel.thirdId2,
+        basic_udirel.thirdId3,
+        basic_udirel.thirdId4,
+        basic_udirel.thirdName1,
+        basic_udirel.thirdName2,
+        basic_udirel.thirdName3,
+        basic_udirel.thirdName4,
+        basic_udirel.ybbm,
+        basic_udirel.sptm,
+        basic_udirel.isDisable,
+        basic_udirel.isLock,
+        basic_udirel.mainId,
+        basic_udirel.lockStatus,
+        basic_udirel.udplatCode,
+        basic_udirel.isAdavence,
+        basic_udirel.supName,
+        basic_udirel.price,
+        basic_udirel.modifyTime,
+        basic_udirel.useMuti,
+        basic_udirel.useNum,
+        basic_udirel.measname  FROM basic_products
+        LEFT JOIN basic_udirel on basic_products.uuid=basic_udirel.uuid
         <where>
             <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
-                AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc},'%')
+                AND basic_products.ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc},'%')
             </if>
             <if test="cpmctymc != '' and cpmctymc != null">
-                AND cpmctymc LIKE concat(#{cpmctymc},'%')
+                AND basic_products.cpmctymc LIKE concat(#{cpmctymc},'%')
             </if>
             <if test="nameCode != '' and nameCode != null">
-                AND nameCode LIKE concat(#{nameCode},'%')
+                AND basic_products.nameCode LIKE concat(#{nameCode},'%')
             </if>
             <if test="uuid != '' and uuid != null">
-                AND uuid = #{uuid}
+                AND basic_products.uuid = #{uuid}
             </if>
             <if test="originUuid != '' and originUuid != null">
-                AND originUuid = #{originUuid}
+                AND basic_products.originUuid = #{originUuid}
             </if>
             <if test="sptm != '' and sptm != null">
-                AND sptm = #{sptm}
+                AND basic_products.sptm = #{sptm}
             </if>
         </where>
 
@@ -279,7 +354,7 @@
             <if test="basicPrductRemak7 != null">basicPrductRemak7=#{basicPrductRemak7},</if>
             <if test="basicPrductRemak8 != null">basicPrductRemak8=#{basicPrductRemak8},</if>
         </trim>
-        WHERE nameCode = #{nameCode}
+        WHERE nameCode = #{nameCode} and uuid = #{uuid}
     </update>
 
     <update id="updateUdiInfoByUuid" parameterType="com.glxp.api.admin.entity.basic.UdiInfoEntity">