bug修改

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

@@ -156,7 +156,7 @@ public class IoOrderDetailBizController extends BaseController {
             datas.add(addBizProductReqeust);
         }
         for (AddBizProductReqeust item : datas) {
-            UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectSupGroupById(item.getRelId());
+            UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectSupGroupById(item.getRelId(), addBizProductReqeust.getSupId());
 
 //            todo 查询产品是否已经通过认证
 //            BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());

src/main/java/com/glxp/api/controller/inv/InvRemindSetController.java

@@ -100,7 +100,6 @@ public class InvRemindSetController {
     /**
      * 通过库存ID查询生成库存预警设置的信息
      *
-     * @param invId
      * @return
      */
     @GetMapping("/udiwms/inv/remind/set/getInfoByInvId")

src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java

@@ -10,6 +10,7 @@ public class FilterUdiRelRequest extends ListPageRequest {
 
     private String ylqxzcrbarmc;
     private String cpmctymc;
+    private String entireCpmctymc;
     private String nameCode;
     private String uuid;
     private String originUuid;

src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java

@@ -55,7 +55,9 @@ public interface UdiRelevanceService extends IService<UdiRelevanceEntity> {
 
     UdiRelevanceResponse selectUdiId(Long id);
 
-    UdiRelevanceResponse selectSupGroupById(Long id);
+
+    UdiRelevanceResponse selectSupGroupById(Long id, String supId);
+
 
     UdiRelevanceEntity selectUpdateByUuid(String uuid);
 

src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java

@@ -198,9 +198,21 @@ public class UdiRelevanceServiceImpl extends ServiceImpl<UdiRelevanceDao, UdiRel
     }
 
     @Override
-    public UdiRelevanceResponse selectSupGroupById(Long id) {
+    public UdiRelevanceResponse selectUdiId(Long id) {
         FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
         filterUdiRelRequest.setId(id);
+        List<UdiRelevanceResponse> data = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest);
+        if (data != null && data.size() > 0)
+            return data.get(0);
+        return null;
+    }
+
+    @Override
+    public UdiRelevanceResponse selectSupGroupById(Long id, String supId) {
+        FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
+        if (StrUtil.isNotEmpty(supId))
+            filterUdiRelRequest.setUnitFk(supId);
+        filterUdiRelRequest.setId(id);
         filterUdiRelRequest.setDiType(1);
         return udiRelevanceDao.selectOneUdiJoinSup(filterUdiRelRequest);
     }
@@ -390,15 +402,4 @@ public class UdiRelevanceServiceImpl extends ServiceImpl<UdiRelevanceDao, UdiRel
         UdiEntity udi = FilterUdiUtils.getUdi(code);
         return udiRelevanceDao.selectRelIdByNameCode(udi.getUdi());
     }
-
-    @Override
-    public UdiRelevanceResponse selectUdiId(Long id) {
-        FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
-        filterUdiRelRequest.setId(id);
-        List<UdiRelevanceResponse> data = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest);
-        if (data != null && data.size() > 0)
-            return data.get(0);
-        return null;
-    }
-
 }

src/main/java/com/glxp/api/service/inout/IoAddInoutService.java

@@ -306,7 +306,7 @@ public class IoAddInoutService {
     public void genOrderDetailCode(IoOrderEntity orderEntity, IoCodeTempEntity codeTempEntity) {
 
         List<IoOrderDetailCodeEntity> ioOrderDetailCodeEntities = orderDetailCodeDao.selectList(new QueryWrapper<IoOrderDetailCodeEntity>().select("id", "count", "reCount", "bindRlFk", "batchNo").eq("orderIdFk", orderEntity.getBillNo()));
-        UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectSupGroupById(codeTempEntity.getRelId());
+        UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectSupGroupById(codeTempEntity.getRelId(), orderEntity.getFromCorp());
 //        UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(codeTempEntity.getRelId());
         if (CollUtil.isEmpty(ioOrderDetailCodeEntities)) {
             orderDetailCodeService.insert(buildEntity(orderEntity, codeTempEntity, udiRelevanceResponse));

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -504,7 +504,9 @@ public class IoOrderServiceImpl implements IoOrderService {
     @Override
     public boolean rollbackUnReOrder(String billNo) {
 
+
         IoOrderEntity orderEntity = findByBillNo(billNo);
+        if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_SUCCESS) {
             List<IoCodeEntity> codeEntityList = codeService.findByOrderId(billNo);
             List<IoCodeTempEntity> codeTempEntities = new ArrayList<>();
             for (IoCodeEntity codeEntity : codeEntityList) {
@@ -519,6 +521,12 @@ public class IoOrderServiceImpl implements IoOrderService {
             orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST);
             orderEntity.setUpdateTime(new Date());
             update(orderEntity);
+        } else if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW) {
+            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_SUCCESS);
+            orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST);
+            orderEntity.setUpdateTime(new Date());
+            update(orderEntity);
+        }
         return true;
     }
 
@@ -833,7 +841,7 @@ public class IoOrderServiceImpl implements IoOrderService {
 
     @Override
     public List<IoOrderEntity> selectList(Long userId) {
-        List<IoOrderEntity> ioOrderEntities = orderDao.selectList(new QueryWrapper<IoOrderEntity>().eq("createUser",userId));
+        List<IoOrderEntity> ioOrderEntities = orderDao.selectList(new QueryWrapper<IoOrderEntity>().eq("createUser", userId));
         return ioOrderEntities;
     }
 

src/main/java/com/glxp/api/service/inv/impl/InvRemindSetServiceImpl.java

@@ -138,6 +138,7 @@ public class InvRemindSetServiceImpl implements InvRemindSetService {
                 response.setExpireDate(invRemindSetEntity.getExpireDate());
                 response.setRecentDate(invRemindSetEntity.getRecentDate());
             }
+
             if (response.getIsDateBy() == 1 && null != response.getRecentDateTime()) {
                 //将近效期预警值由小时换算成天
                 response.setRecentDateTime(response.getRecentDateTime() / 24);

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -330,6 +330,9 @@
             <if test="cpmctymc != '' and cpmctymc != null">
                 AND cpmctymc LIKE concat('%', #{cpmctymc}, '%')
             </if>
+            <if test="entireCpmctymc != '' and entireCpmctymc != null">
+                AND cpmctymc = #{entireCpmctymc}
+            </if>
             <if test="ggxh != '' and ggxh != null">
                 AND ggxh LIKE concat('%', #{ggxh}, '%')
             </if>
@@ -584,8 +587,6 @@
             <if test="tyshxydm != '' and tyshxydm != null">
                 AND basic_products.tyshxydm = #{tyshxydm}
             </if>
-
-
         </where>
         GROUP BY cpmctymc, manufactory
     </select>
@@ -1249,5 +1250,4 @@
         </where>
         limit 1
     </select>
-
 </mapper>

src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml

@@ -32,6 +32,7 @@
                      LEFT JOIN io_order a1 ON a1.billNo = a2.orderIdFk
                      LEFT JOIN basic_corp b1 ON b1.erpId = a1.fromCorp
         <where>
+            a1.status = 7
             <if test="orderIdFk != null and orderIdFk != ''">
                 AND a2.orderIdFk = #{orderIdFk}
             </if>