feature：手工填开查询商品

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java

@@ -398,7 +398,15 @@ public class CommodityController {
     @PostMapping("/uploadCommodityExcel")
     @ApiOperation(value = "商品信息模板导入", notes = "商品信息管理-商品信息模板导入")
     @SysLog(operation = "商品信息模板导入", operationDesc = "商品信息模板导入", key = "商品信息管理")
-    public R uploadCommodityExcel(@RequestParam("file") MultipartFile file) throws Exception {
+    public R uploadCommodityExcel(@RequestParam("file") MultipartFile file,
+                                  @ApiParam(name = "xhfYh", value = "销货方银行", required = true) @RequestParam(value = "xhfYh") String xhfYh,
+                                  @ApiParam(name = "xhfDz", value = "销货方地址", required = true) @RequestParam(value = "xhfDz") String xhfDz,
+                                  @ApiParam(name = "xhfDh", value = "销货方电话", required = true) @RequestParam(value = "xhfDh") String xhfDh,
+                                  @ApiParam(name = "xhfZh", value = "销货方账号", required = true) @RequestParam(value = "xhfZh") String xhfZh,
+                                  @ApiParam(name = "xhfNsrsbh", value = "销货方纳税人识别号", required = true) @RequestParam(value = "xhfNsrsbh") String xhfNsrsbh,
+                                  @ApiParam(name = "xhfMc", value = "销货方纳税人名称", required = true) @RequestParam(value = "xhfMc") String xhfMc,
+                                  @ApiParam(name = "entId", value = "数据组织Id", required = false) @RequestParam(value = "entId", required = false) String entId,
+                                  @ApiParam(name = "userId", value = "用户ID", required = true) @RequestParam(value = "userId") String userId) throws Exception {
         log.info("商品模板导入");
 
 
@@ -417,8 +425,6 @@ public class CommodityController {
 
         List<CommodityExcel> commodityExcelList = handle.readFromExcel(file.getInputStream(), CommodityExcel.class);
         //获取当前登录人ID
-        UserEntity userEntity = userInfoService.getUser();
-        List<String> taxpayerCodeList = userInfoService.getTaxpayerCodeList();
 
         List<Map<String, String>> resultMap = new ArrayList<>();
         int num = 0;
@@ -448,17 +454,6 @@ public class CommodityController {
                 continue;
             }
 
-            if (StringUtils.isNotBlank(commodityExcel.getXhfNsrsbh()) && !taxpayerCodeList.contains(commodityExcel.getXhfNsrsbh())) {
-                resultMap.add(CheckParamUtil.generateErrorMap("", prefix, OrderInfoContentEnum.COMMODITY_MESSAGE_SYNC_NULL4));
-                continue;
-            }
-            if (StringUtils.isNotBlank(commodityExcel.getXhfMc())) {
-                DeptEntity deptEntity = userInfoService.querySysDeptEntityByTaxplayercode(commodityExcel.getXhfNsrsbh());
-                if(!commodityExcel.getXhfMc().equals(deptEntity.getName())){
-                    resultMap.add(CheckParamUtil.generateErrorMap("", prefix, OrderInfoContentEnum.COMMODITY_MESSAGE_SYNC_NULL5));
-                    continue;
-                }
-            }
 
         }
 
@@ -470,7 +465,7 @@ public class CommodityController {
         /**
          * excel 导入数据转换为表格数据
          */
-        List<CommodityCodeEntity> commodityCodeEntities = transCommodityCodeEntityList(commodityExcelList, String.valueOf(userEntity.getUserId()),userEntity.getDept().getDeptId());
+        List<CommodityCodeEntity> commodityCodeEntities = transCommodityCodeEntityList(commodityExcelList,xhfNsrsbh,xhfMc, String.valueOf(userId),entId);
 
 
         return commodityService.uploadCommodityCode(commodityCodeEntities);
@@ -482,14 +477,15 @@ public class CommodityController {
      * @param commodityExcelList
      * @return
      */
-    public List<CommodityCodeEntity> transCommodityCodeEntityList(List<CommodityExcel> commodityExcelList, String userId, String deptId) {
+    public List<CommodityCodeEntity> transCommodityCodeEntityList(List<CommodityExcel> commodityExcelList,String xhfNsrsbh,String xhfMc, String userId, String deptId) {
         List<CommodityCodeEntity> commodityCodeEntityList = new ArrayList<>();
         if (ObjectUtil.isNotEmpty(commodityExcelList)) {
             for (CommodityExcel commodityExcel : commodityExcelList) {
                 CommodityCodeEntity commodityCodeEntity = new CommodityCodeEntity();
                 commodityCodeEntity.setId("");
                 commodityCodeEntity.setSortId(0L);
-                commodityCodeEntity.setXhfNsrsbh(commodityExcel.getXhfNsrsbh());
+                commodityCodeEntity.setXhfNsrsbh(xhfNsrsbh);
+                commodityCodeEntity.setXhfMc(xhfMc);
                 commodityCodeEntity.setXmmc(commodityExcel.getXmmc());
                 commodityCodeEntity.setZxbm(commodityExcel.getZxbm());
                 commodityCodeEntity.setSpsm("");
@@ -519,7 +515,7 @@ public class CommodityController {
                 commodityCodeEntity.setDataSource("");
                 commodityCodeEntity.setDataState("");
                 commodityCodeEntity.setMatchingState("");
-                commodityCodeEntity.setXhfMc(commodityExcel.getXhfMc());
+
                 commodityCodeEntity.setSpjc(commodityExcel.getSpjc());
                 commodityCodeEntity.setBz(commodityExcel.getBz());
                 commodityCodeEntity.setCollectIdent("");

order-management-base-service/src/main/java/com/dxhy/order/baseservice/openapi/protocol/qd/PageSpxxReq.java

@@ -53,6 +53,8 @@ public class PageSpxxReq implements Serializable {
 
     @ApiModelProperty(name = "sl", value = "商品税率")
     private String sl;
+    @ApiModelProperty(name = "deptId", value = "部门id")
+    private String deptId;
 
     private String dataStatus;