禅道相关bug修改

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

@@ -90,7 +90,7 @@ public class IoOrderController extends BaseController {
             if (filterOrderRequest.getSourceLocalType() == 1) {
                 filterOrderRequest.setSourceTypes(Arrays.asList(1, 2, 3, 4, 5));
             } else {
-                filterOrderRequest.setSourceTypes(Arrays.asList(6,7, 8, 9, 10, 11, 12, 13, 14, 15, 17));
+                filterOrderRequest.setSourceTypes(Arrays.asList(6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 17));
             }
         }
 
@@ -418,7 +418,7 @@ public class IoOrderController extends BaseController {
         } else if (stockOrderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_SUCCESS) {
 
             //1.校验是否为委托验收人
-            if (!stockOrderEntity.getEntrustEnd()==true) {
+            if (!stockOrderEntity.getEntrustEnd() == true) {
                 BasicEntrustRecRequest basicEntrustRecRequest = new BasicEntrustRecRequest();
                 basicEntrustRecRequest.setAction(stockOrderEntity.getAction());
                 basicEntrustRecRequest.setEntrustUser(userId);

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());
@@ -169,6 +169,13 @@ public class IoOrderDetailBizController extends BaseController {
                 }
             }
 
+            if (bussinessTypeEntity.isVailDispatch()) {
+                if (!udiRelevanceResponse.isDispatch()) {
+                    return ResultVOUtils.error(500, "该产品不可配送，请联系院方！");
+                }
+            }
+
+
             IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();
             ioOrderDetailBizEntity.setOrderIdFk(orderEntity.getBillNo());
             ioOrderDetailBizEntity.setBindRlFk(udiRelevanceResponse.getId());

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/auth/impl/DeptUserServiceImpl.java

@@ -64,6 +64,9 @@ public class DeptUserServiceImpl implements DeptUserService {
 
     @Override
     public boolean delete(Long deptId, Long userId) {
+
+
+
         return deptUserDao.deleteByDept(deptId, userId);
     }
 

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

@@ -55,7 +55,7 @@ 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

@@ -208,8 +208,10 @@ public class UdiRelevanceServiceImpl extends ServiceImpl<UdiRelevanceDao, UdiRel
     }
 
     @Override
-    public UdiRelevanceResponse selectSupGroupById(Long id) {
+    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);

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

@@ -308,7 +308,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

@@ -491,6 +491,7 @@ public class IoOrderServiceImpl implements IoOrderService {
     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) {
@@ -505,6 +506,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;
     }
 
@@ -805,7 +812,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/task/AsyncHeartTask.java

@@ -21,8 +21,8 @@ import javax.annotation.Resource;
 import java.util.Arrays;
 
 
-@Component
-@EnableScheduling
+//@Component
+//@EnableScheduling
 public class AsyncHeartTask implements SchedulingConfigurer {
 
     final Logger logger = LoggerFactory.getLogger(AsyncHeartTask.class);

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

@@ -327,6 +327,10 @@
             <if test="nameCode != '' and nameCode != null">
                 AND nameCode LIKE concat(#{nameCode}, '%')
             </if>
+
+            <if test="entireCpmctymc != '' and entireCpmctymc != null">
+                AND cpmctymc = #{entireCpmctymc}
+            </if>
             <if test="cpmctymc != '' and cpmctymc != null">
                 AND cpmctymc LIKE concat('%', #{cpmctymc}, '%')
             </if>
@@ -408,7 +412,7 @@
                 and originUuid = #{originUuid}
             </if>
             <if test="manufactory != null and manufactory != ''">
-                and manufactory LIKE concat('%',#{manufactory},'%')
+                and manufactory LIKE concat('%', #{manufactory}, '%')
             </if>
             <if test="dispatch != null">
                 and basic_udirel.dispatch = #{dispatch}
@@ -585,8 +589,6 @@
             <if test="tyshxydm != '' and tyshxydm != null">
                 AND basic_products.tyshxydm = #{tyshxydm}
             </if>
-
-
         </where>
         GROUP BY cpmctymc, manufactory
     </select>

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>