修改bug

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

@@ -204,6 +204,12 @@ public class BussinessLocalTypeController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         if (bussinessTypeEntity != null) {
+
+            BussinessLocalTypeEntity bussinessLocalTypeEntity1 = bussinessLocalTypeService.findBTByName(bussinessTypeEntity.getName(),String.valueOf(bussinessTypeEntity.getId()));
+            if (bussinessLocalTypeEntity1 != null) {
+                return ResultVOUtils.error(999, "业务单据类型名称已存在！");
+            }
+
             bussinessTypeEntity.setUpdateTime(new Date());
             bussinessLocalTypeService.updateBusLocalType(bussinessTypeEntity);
         } else {
@@ -223,7 +229,7 @@ public class BussinessLocalTypeController {
         if (bussinessTypeEntity != null) {
             bussinessTypeEntity.setAction("ST" + CustomUtil.getId());
             BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findByAction(bussinessTypeEntity.getAction());
-            BussinessLocalTypeEntity bussinessLocalTypeEntity1 = bussinessLocalTypeService.findBTByName(bussinessTypeEntity.getName());
+            BussinessLocalTypeEntity bussinessLocalTypeEntity1 = bussinessLocalTypeService.findBTByName(bussinessTypeEntity.getName(),null);
             if (bussinessLocalTypeEntity1 != null) {
                 return ResultVOUtils.error(999, "业务单据类型名称已存在！");
             }

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

@@ -8,6 +8,7 @@ import com.github.pagehelper.PageInfo;
 import com.glxp.api.admin.annotation.AuthRuleAnnotation;
 import com.glxp.api.admin.config.WebSocketServer;
 import com.glxp.api.admin.constant.ConstantStatus;
+import com.glxp.api.admin.dao.basic.UdiRelevanceDao;
 import com.glxp.api.admin.entity.basic.*;
 import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
 import com.glxp.api.admin.entity.inout.WarehouseEntity;
@@ -85,6 +86,8 @@ public class UdiRelevanceController {
     RedisUtil redisUtil;
     @Resource
     HttpOkClient httpOkClient;
+    @Resource
+    UdiRelevanceDao udiRelevanceDao;
 
     @AuthRuleAnnotation("")
     @GetMapping("/udi/udirel/download")
@@ -296,6 +299,12 @@ public class UdiRelevanceController {
         udiRelevanceEntity.setModifyTime(time);
         UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
         BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
+        //根据uuid查询id
+        List<UdiRelevanceEntity> udiRelevanceEntityList=udiRelevanceDao.selectByUuid(udiRelevanceEntity.getUuid());
+        if(udiRelevanceEntityList.size()>0){
+            String id=udiRelevanceEntityList.get(0).getId();
+            udiRelevanceRequest.setId(id);
+        }
         udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
         return ResultVOUtils.success("更新成功");
     }

api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java

@@ -743,7 +743,7 @@ public class StockOrderController {
         if (orderEntity.getExportStatus() == ConstantStatus.ORDER_EXPORT_ED) {
             return ResultVOUtils.error(500, "单据已同步到内网UDI管理系统，无法撤回！");
         }
-        boolean result = stockOrderService.rollbackOrder(billNo,contrastStatus);
+        boolean result = stockOrderService.rollbackOrder(billNo);
         if (result) {
             return ResultVOUtils.success();
         }
@@ -757,7 +757,7 @@ public class StockOrderController {
         if (StrUtil.isBlank(billNo)) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }
-        boolean result = stockOrderService.rollbackOrder(billNo,contrastStatus);
+        boolean result = stockOrderService.rollbackOrder(billNo);
         if (result) {
             return ResultVOUtils.success("撤回成功！");
         }

api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessLocalTypeDao.java

@@ -7,6 +7,7 @@ import com.glxp.api.admin.res.basic.BussinessOriginTypeResponse;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import javax.naming.Name;
 import java.util.List;
 
 @Mapper
@@ -27,9 +28,7 @@ public interface BussinessLocalTypeDao {
 
     List<BussinessLocalTypeEntity> filterAllList(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest);
 
-    BussinessLocalTypeEntity findBTByAction(String action);
 
-    BussinessLocalTypeEntity findBTByName(String name);
 
     boolean updateBusLocalType(BussinessLocalTypeEntity bussinessTypeEntity);
 
@@ -45,4 +44,7 @@ public interface BussinessLocalTypeDao {
      * @param action
      */
     Boolean selectPreInByOrderType(String action);
+
+    //根据名字查询
+    BussinessLocalTypeEntity selectByName(@Param("name") String name,@Param("id") String id);
 }

api-admin/src/main/java/com/glxp/api/admin/dao/inout/CodesDao.java

@@ -59,4 +59,6 @@ public interface CodesDao {
      * @return
      */
     String selectSupIdByCode(String code);
+
+    WarehouseEntity  findOrderId(@Param("orderId") String orderId);
 }

api-admin/src/main/java/com/glxp/api/admin/dao/inout/CodesTempDao.java

@@ -35,4 +35,6 @@ public interface CodesTempDao {
 
     List<WarehouseEntity> findByOrderIdAndCode(WarehouseQueryRequest warehouseQueryRequest);
 
+
+
 }

api-admin/src/main/java/com/glxp/api/admin/dao/inout/OrderDao.java

@@ -105,5 +105,5 @@ public interface OrderDao {
      * @param billNo
      * @return
      */
-    OrderEntity selectByBillNoAndStatus(String billNo,Integer contrastStatus);
+    List<OrderEntity> selectByBillNoAndStatus(String billNo);
 }

api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessLocalTypeService.java

@@ -31,7 +31,7 @@ public interface BussinessLocalTypeService {
     BussinessLocalTypeEntity findByAction(String action);
     BussinessLocalTypeEntity findBTByAction(String action);
 
-    BussinessLocalTypeEntity findBTByName(String name);
+    BussinessLocalTypeEntity findBTByName(String name,String id);
 
     boolean insertBussinessType(BussinessLocalTypeEntity bussinessLocalTypeEntity);
 

api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java

@@ -147,17 +147,12 @@ public class BussinessLocalTypeServiceImpl implements BussinessLocalTypeService
     }
 
     @Override
-    public BussinessLocalTypeEntity findBTByName(String name) {
+    public BussinessLocalTypeEntity findBTByName(String name,String id) {
         if (StrUtil.isEmpty(name)) {
             return null;
         }
-        BussinessLocalTypeFilterRequest bussinessTypeFilterRequest = new BussinessLocalTypeFilterRequest();
+       BussinessLocalTypeEntity bussinessLocalTypeEntity=bussinessLocalTypeDao.selectByName(name,id);
-        bussinessTypeFilterRequest.setName(name);
+        return bussinessLocalTypeEntity;
-        List<BussinessLocalTypeEntity> data = bussinessLocalTypeDao.filterList(bussinessTypeFilterRequest);
-        if (data != null && data.size() > 0) {
-            return data.get(0);
-        }
-        return null;
     }
 
     @Override

api-admin/src/main/java/com/glxp/api/admin/service/business/StockOrderService.java

@@ -70,6 +70,6 @@ public interface StockOrderService {
 
 
 
-    boolean rollbackOrder(String billNo,Integer contrastStatus);
+    boolean rollbackOrder(String billNo);
 
 }

api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderServiceImpl.java

@@ -15,6 +15,7 @@ import com.glxp.api.admin.dao.basic.BussinessLocalTypeDao;
 import com.glxp.api.admin.dao.business.StockOrderDao;
 import com.glxp.api.admin.dao.business.StockOrderDetailDao;
 import com.glxp.api.admin.dao.inout.CodesDao;
+import com.glxp.api.admin.dao.inout.CodesTempDao;
 import com.glxp.api.admin.dao.inout.OrderDao;
 import com.glxp.api.admin.dao.inout.OrderDetailDao;
 import com.glxp.api.admin.dao.inventory.InvPreInProductDao;
@@ -99,6 +100,9 @@ public class StockOrderServiceImpl implements StockOrderService {
     SpGetHttpClient spGetHttp;
     @Resource
     private OrderDetailDao orderDetailDao;
+    @Resource
+    private CodesTempDao codesTempDao;
+
 
 
     @Override
@@ -337,11 +341,22 @@ public class StockOrderServiceImpl implements StockOrderService {
     }
 
     @Override
-    public boolean rollbackOrder(String billNo,Integer contrastStatus) {
+    public boolean rollbackOrder(String billNo) {
         //查询业务单据
         StockOrderEntity stockOrderEntity = stockOrderDao.selectByBillNo(billNo);
         //查询扫码单据
-        OrderEntity orderEntity = orderDao.selectByBillNoAndStatus(billNo,contrastStatus);
+        OrderEntity orderEntity=new OrderEntity();
+        List<OrderEntity> orderEntityList = orderDao.selectByBillNoAndStatus(billNo);
+        if(orderEntityList.size()>1){
+            for (OrderEntity obj:orderEntityList){
+                if(obj.getErpFk().equals(billNo)){
+                    orderEntity=obj;
+                    break;
+                }
+            }
+        }else{
+            orderEntity=orderEntityList.get(0);
+        }
         BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction());
         if (stockOrderEntity.getStatus().equals(ConstantStatus.SORDER_CHECKED)) {
             //回退未验收单据
@@ -367,7 +382,12 @@ public class StockOrderServiceImpl implements StockOrderService {
                 orderEntity.setErpFk("");
                 stockOrderDao.deleteById(stockOrderEntity.getId());
                 orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
+                //删除正式码表的单据插入临时码表的数据
                 orderDao.updateOrder(orderEntity);
+                WarehouseEntity warehouseEntity=new WarehouseEntity();
+                warehouseEntity=codesDao.findOrderId(orderEntity.getId());
+                codesTempDao.insertCodesTempSingle(warehouseEntity);
+                codesDao.deleteById(warehouseEntity.getId());
                 //置空扫码单据详情关联的业务单据号
                 orderDetailDao.updateErpOrderId(orderEntity.getId(), null);
             }
@@ -489,7 +509,7 @@ public class StockOrderServiceImpl implements StockOrderService {
                     orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK);
                     orderEntity.setErpFk("");
                     stockOrderDao.updateById(stockOrderEntity);
-                    orderDao.updateOrder(orderEntity);
+
                 } else {
                     orderEntity.setErpFk("");
                     stockOrderDao.deleteById(stockOrderEntity.getId());
@@ -498,7 +518,7 @@ public class StockOrderServiceImpl implements StockOrderService {
                     List<WarehouseEntity> warehouseEntityList = codesDao.findByReceiptId(orderEntity.getId());
                     if (CollUtil.isNotEmpty(warehouseEntityList)) {
                         codesTempService.insertCodesTemp(warehouseEntityList);
-                        codesDao.deleteByOrderId(orderEntity.getId());
+
                     }
                 }
             }

api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java

@@ -528,7 +528,7 @@ public class IoTransInoutService {
             if (originSupId != null) {
                 warehouseEntity.setSupId(originSupId);
             }
-            if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1 && warehouseEntity.getRelId() == null) {//同一个DI绑定多个产品西信息
+           if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1 && warehouseEntity.getRelId() == null) {//同一个DI绑定多个产品西信息
                 warehouseEntity.setRelId(null);
                 warehouseEntity.setStatus(ConstantStatus.ORDER_DETAIL_DI_MUTI);
             } else if (udiRelevanceEntities == null || udiRelevanceEntities.size() == 0) {//未找到产品信息，一般不会出现

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

@@ -281,4 +281,19 @@
             select localAction from basic_bussiness_type where basic_bussiness_type.action = #{action}
             )
     </select>
+
+
+    <select id="selectByName" parameterType="string" resultType="com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity">
+        select *
+        FROM basic_bustype_local
+        <where>
+            <if test="name != ''and name != null">
+                AND basic_bustype_local.name = #{name}
+            </if>
+            <if test="id != ''and id != null">
+                AND basic_bustype_local.id != #{id}
+            </if>
+
+        </where>
+    </select>
 </mapper>

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

@@ -193,4 +193,17 @@
     <select id="selectSupIdByCode" resultType="java.lang.String">
         select supId from io_codes where code = #{code} limit 1
     </select>
+
+
+    <select id="findOrderId" parameterType="string"
+            resultType="com.glxp.api.admin.entity.inout.WarehouseEntity">
+        SELECT *
+        FROM io_codes
+        <where>
+            <if test="orderId != '' and orderId!=null">
+                and orderId =#{orderId}
+            </if>
+        </where>
+    </select>
+
 </mapper>

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

@@ -209,4 +209,6 @@
         FROM io_codes_temp
         WHERE id = #{id}
     </delete>
+
+
 </mapper>

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

@@ -35,7 +35,7 @@
                              exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
                              outChangeEnable, originUllageSupNo, preCheck, updateTime, replicateNo, invWarehouseCode,
                              fromSubInvCode, createTime, originFromType, invStorageCode, deptCode, printRemark,
-                             codeFillCheck, preInBillNo, preOutBillNo, wzUploadResult, wzUploadResult)
+                             codeFillCheck, preInBillNo, preOutBillNo, wzUploadStatus, wzUploadResult)
         values (#{id},
                 #{action},
                 #{corpOrderId},
@@ -678,8 +678,5 @@
         left join auth_dept on io_order.deptCode = auth_dept.code
         where io_order.status = 4
         and (io_order.id = #{billNo} or io_order.erpFk = #{billNo})
-        <if test="contrastStatus!=null">
-            and contrastStatus=#{contrastStatus}
-        </if>
     </select>
 </mapper>