Merge branch 'dev' into test

src/main/java/com/glxp/api/controller/auth/LoginController.java

@@ -318,7 +318,6 @@ public class LoginController extends BaseController {
     }
 
 
-
     @Autowired
     private InvWarehouseDao invWarehouseDao;
 
@@ -407,8 +406,8 @@ public class LoginController extends BaseController {
     }
 
 
-
     //------------------------------------------UDIMS接口-----------------------------------------------------------
+
     /**
      * 平台验证
      *

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

@@ -43,6 +43,7 @@ import com.glxp.api.util.OrderNoTypeBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.scheduling.annotation.Async;
@@ -798,6 +799,10 @@ public class IoOrderController extends BaseController {
             List<IoOrderInvoiceEntity> ioOrderInvoiceEntity = orderInvoiceService.list(ew);
             List<String> orderIds = ioOrderInvoiceEntity.stream().map(IoOrderInvoiceEntity::getOrderIdFk).collect(Collectors.toList());
             filterOrderRequest.setOrderIds(orderIds);
+            if(CollectionUtils.isEmpty(orderIds)){
+                PageInfo<IoOrderResponse> pageInfo = new PageInfo<>();
+                return ResultVOUtils.page(pageInfo);
+            }
         }
 
 

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

@@ -27,6 +27,7 @@ import com.glxp.api.service.auth.CustomerService;
 import com.glxp.api.service.inout.IoOrderDetailBizService;
 import com.glxp.api.service.inout.IoOrderDetailCodeService;
 import com.glxp.api.service.inout.impl.IoOrderInvoiceService;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -193,4 +194,20 @@ public class IoOrderInvoiceController {
         else
             return ResultVOUtils.error(500, "删除失败！");
     }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/inout/invoice/checkInvoiceCode")
+    public BaseResponse checkInvoiceCode(@RequestBody DeleteRequest deleteRequest) {
+        if (StrUtil.isEmpty(deleteRequest.getInvoiceEncode()))
+            return ResultVOUtils.error(500, "发票编码不能为空");
+
+        List<IoOrderInvoiceEntity> ioOrderInvoiceEntityList = ioOrderInvoiceService.list(new QueryWrapper<IoOrderInvoiceEntity>().eq("invoiceEncode", deleteRequest.getInvoiceEncode()));
+        if (CollectionUtils.isNotEmpty(ioOrderInvoiceEntityList) && ioOrderInvoiceEntityList.size()>0){
+            return ResultVOUtils.error(999,"发票编码已存在！");
+        }
+          return ResultVOUtils.success();
+
+    }
+
+
 }

src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java

@@ -304,7 +304,7 @@ public class BasicBussinessTypeEntity {
     private boolean changeEnable;
 
     /**
-     * 是否供应商使用
+     * 是否供应商使用 0:无权限；1：可查看；2：可修改
      */
     @TableField(value = "spUse")
     private int spUse;

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

@@ -70,11 +70,11 @@ public class IoOrderUtilsService {
         //扫码明细表生成
         FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest = new FilterCompanyProductRelevanceRequest();
         List<IoCodeTempEntity> ioCodeTempEntities = new ArrayList<>();
-        for (IoCodeEntity ioCodeTempEntity : ioCodeEntityList) {
+        for (IoCodeEntity ioCodeEntity : ioCodeEntityList) {
             IoCodeTempEntity ioCodeTempEntity1 = new IoCodeTempEntity();
             //查询物资信息
             filterCompanyProductRelevanceRequest.setCustomerId(Long.valueOf(platformLinkRespons.getCustomerId()));
-            filterCompanyProductRelevanceRequest.setNameCode(ioCodeTempEntity.getNameCode());
+            filterCompanyProductRelevanceRequest.setNameCode(ioCodeEntity.getNameCode());
             List<ioOrderUploadRequest> udiRlSupEntityList = udiRlSupDao.filterCompanyProduct(filterCompanyProductRelevanceRequest);
             if (CollectionUtil.isNotEmpty(udiRlSupEntityList) && udiRlSupEntityList.size() > 1) {
                 ioCodeTempEntity1.setRelId(null);
@@ -82,23 +82,23 @@ public class IoOrderUtilsService {
             } else {
                 if (CollectionUtil.isNotEmpty(udiRlSupEntityList)) {
                     ioCodeTempEntity1.setRelId(udiRlSupEntityList.get(0).getId());
-                    map.put(ioCodeTempEntity.getRelId(), udiRlSupEntityList.get(0));
+                    map.put(ioCodeEntity.getRelId(), udiRlSupEntityList.get(0));
                 }
 
                 ioCodeTempEntity1.setOrderId(billNO);
-                String code = URLDecoder.decode(ioCodeTempEntity.getCode(), StandardCharsets.UTF_8);
+                String code = URLDecoder.decode(ioCodeEntity.getCode(), StandardCharsets.UTF_8);
                 ioCodeTempEntity1.setCode(code);
-                ioCodeTempEntity1.setMainAction(ioCodeTempEntity.getMainAction());
+                ioCodeTempEntity1.setMainAction(ioCodeEntity.getMainAction());
                 ioCodeTempEntity1.setAction(platformLinkRespons.getTargetAction());
-                ioCodeTempEntity1.setNameCode(ioCodeTempEntity.getNameCode());
-                ioCodeTempEntity1.setBatchNo(ioCodeTempEntity.getBatchNo());
-                ioCodeTempEntity1.setProduceDate(ioCodeTempEntity.getProduceDate());
-                ioCodeTempEntity1.setExpireDate(ioCodeTempEntity.getExpireDate());
-                ioCodeTempEntity1.setSerialNo(ioCodeTempEntity.getSerialNo());
-                ioCodeTempEntity1.setPackageLevel(ioCodeTempEntity.getPackageLevel());
-                ioCodeTempEntity1.setSupId(ioCodeTempEntity.getSupId());
-                ioCodeTempEntity1.setCount(ioCodeTempEntity.getCount());
-                ioCodeTempEntity1.setReCount(ioCodeTempEntity.getReCount());
+                ioCodeTempEntity1.setNameCode(ioCodeEntity.getNameCode());
+                ioCodeTempEntity1.setBatchNo(ioCodeEntity.getBatchNo());
+                ioCodeTempEntity1.setProduceDate(ioCodeEntity.getProduceDate());
+                ioCodeTempEntity1.setExpireDate(ioCodeEntity.getExpireDate());
+                ioCodeTempEntity1.setSerialNo(ioCodeEntity.getSerialNo());
+                ioCodeTempEntity1.setPackageLevel(ioCodeEntity.getPackageLevel());
+                ioCodeTempEntity1.setSupId(ioCodeEntity.getSupId());
+                ioCodeTempEntity1.setCount(ioCodeEntity.getCount());
+                ioCodeTempEntity1.setReCount(ioCodeEntity.getReCount());
                 ioCodeTempEntity1.setDeptCode(platformLinkRespons.getInvCode());
                 ioCodeTempEntity1.setInvCode(platformLinkRespons.getInvSubCode());
                 ioCodeTempEntity1.setUpdateTime(new Date());

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

@@ -87,6 +87,9 @@ public class IoOrderInvoiceService extends ServiceImpl<IoOrderInvoiceMapper, IoO
                 }
             }
             orderResponse.setAllAmount(amount);
+            if(StrUtil.isBlank(orderResponse.getCheckStatus())){
+                orderResponse.setCheckStatus("0");
+            }
         } else
             return orderResponse;
 

src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml

@@ -411,7 +411,8 @@
         auth_warehouse.name,
         auth_warehouse.parentId,
         auth_warehouse.parentCode,
-        auth_dept.name warehouseName,
+        auth_dept.name deptName,
+        auth_dept.code deptCode,
         auth_warehouse.advanceType
         from auth_warehouse
         inner join auth_dept on auth_warehouse.parentId = auth_dept.code

src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml

@@ -165,7 +165,11 @@
                basic_bussiness_type.name
         from auth_warehouse_bustype
                      inner join basic_bussiness_type on auth_warehouse_bustype.action = basic_bussiness_type.action
-        where code = #{code}
+        where spUse = 2
+          and mainAction = 'WareHouseIn'
+          and enable = true
+          and corpType = 2
+          and code = #{code}
     </select>
 
 
@@ -189,7 +193,8 @@
                b1.`name`
         FROM auth_warehouse_bustype a1
                      INNER JOIN basic_bussiness_type b1 ON a1.action = b1.action
-        where b1.spUse=1 and a1.code = #{code}
+        where b1.spUse = 1
+          and a1.code = #{code}
         group by b1.id
     </select>
 </mapper>