Merge remote-tracking branch 'origin/master'

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java

@@ -54,9 +54,9 @@ public class AppIndexEnum {
         JFKC("a204a3fa-c8ac-4795-966c-df1d0e131bcf", "家访考察"),
         FKZLSC("65dc12e0-9213-4364-ae81-18afa9c7e1ee", "放款资料上传"),
         DYBL("ab7df5a0-9708-48b1-b58a-60d7e024d0a2", "抵押办理"),
-        WXWB("c3a6be91-3e95-4520-b5a7-c805d8f187d7", "维修完毕-售后"),
+        WXWB("c3a6be91-3e95-4520-b5a7-c805d8f187d7", "维修完毕"),
-        SPSJ("781ce38b-b003-4efd-accf-fbee0ca33091", "商品上架-售后"),
+        SPSJ("781ce38b-b003-4efd-accf-fbee0ca33091", "商品上架"),
-        PJJS("37905444-5454-4b08-897d-6c2c089c317d", "配件接收-售后"),
+        PJJS("37905444-5454-4b08-897d-6c2c089c317d", "配件接收"),
         ;
 
         /**

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java

@@ -50,6 +50,8 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.text.ParseException;
@@ -291,16 +293,28 @@ public class ScmSpecialRebateRest implements ScmSpecialRebateFeign {
 
     @Override
     public void downloadExcel() {
-        List<DownloadExcelVo> list = new ArrayList<>();
-        //定义导出的excel名字
-        String excelName = "专项返利管理导入模板";
-        String fileNameURL = "";
         try {
-            fileNameURL = URLEncoder.encode(excelName, "UTF-8");
+            InputStream resourceAsStream = this.getClass().getClassLoader().getResourceAsStream("static/专项返利模版.xls");
-        } catch (UnsupportedEncodingException e) {
+            //获取要下载的模板名称
-            e.printStackTrace();
+            String fileName = "专项返利模版.xls";
+            response.setHeader("content-type", "application/octet-stream");
+            response.setContentType("application/octet-stream");
+            // 下载文件能正常显示中文
+            fileName = URLEncoder.encode(fileName, "UTF-8");
+            response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+            response.setHeader("fileName", fileName);
+            response.setHeader("Access-Control-Expose-Headers", "filename");
+            OutputStream out = response.getOutputStream();
+            byte[] b = new byte[2048];
+            int len;
+            while ((len = resourceAsStream.read(b)) != -1) {
+                out.write(b, 0, len);
+            }
+            out.close();
+            resourceAsStream.close();
+        } catch (Exception ex) {
+            ex.printStackTrace();
         }
-        ExportExcelUtils.export(fileNameURL, list, DownloadExcelVo.class, response);
     }
 
     @Override

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java

@@ -1014,6 +1014,9 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
         }
         if (!importVoList.isEmpty()) {
             for (ExcelInfo excelInfo : importVoList) {
+                if (StringUtils.isBlank(excelInfo.getRemarks())){
+                    excelInfo.setRemarks("");
+                }
                 ScmSpecialRebateVo scmSpecialRebateVo = baseMapper.selectExcel(createOrgSid, excelInfo.getRebateTypeValue(), excelInfo.getRebateName(), excelInfo.getEstimateRebate(), excelInfo.getPalceGenDate(), excelInfo.getPurchaseSystemName(), excelInfo.getBrandName(), excelInfo.getRemarks());
                 if (scmSpecialRebateVo != null) {
                     checkWord.add("返利名称" + excelInfo.getRebateName() + "导入的返利信息已存在");
@@ -1163,6 +1166,9 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
             List<OneExcelInfo> infos = importReturn.getInfos();
             for (OneExcelInfo info : infos) {
                 if (StringUtils.isNotBlank(info.getUploadDate()) && StringUtils.isNotBlank(info.getUploadMoney())) {
+                    if (StringUtils.isBlank(info.getRemarks())){
+                        info.setRemarks("");
+                    }
                     ScmSpecialRebateVo scmSpecialRebateVo = baseMapper.selectExcel(createOrgSid, info.getRebateTypeValue(), info.getRebateName(), info.getEstimateRebate(), info.getPalceGenDate(), info.getPurchaseSystemName(), info.getBrandName(), info.getRemarks());
                     String uploadDate = "";
                     if (isNumber(info.getUploadDate())) {
@@ -1327,6 +1333,9 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
         }
         if (!importVoList.isEmpty()) {
             for (OneExcelInfo excelInfo : importVoList) {
+                if (StringUtils.isBlank(excelInfo.getRemarks())){
+                    excelInfo.setRemarks("");
+                }
                 ScmSpecialRebateVo scmSpecialRebateVo = baseMapper.selectExcel(createOrgSid, excelInfo.getRebateTypeValue(), excelInfo.getRebateName(), excelInfo.getEstimateRebate(), excelInfo.getPalceGenDate(), excelInfo.getPurchaseSystemName(), excelInfo.getBrandName(), excelInfo.getRemarks());
                 if (scmSpecialRebateVo == null || StringUtils.isBlank(scmSpecialRebateVo.getSid())) {
                     checkWord.add("返利名称" + excelInfo.getRebateName() + "导入的返利信息不存在");
@@ -1415,13 +1424,21 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                     }
                 }
                 if (StringUtils.isBlank(excelInfo.getUploadDate()) && StringUtils.isNotBlank(excelInfo.getUploadMoney())) {
-                    checkWord.add("上传日期不能为空");
+                    if (new BigDecimal(excelInfo.getUploadMoney()).compareTo(BigDecimal.ZERO) != 0){
-                    break;
+                        checkWord.add("上传日期不能为空");
+                        break;
+                    }
                 }
                 if (StringUtils.isNotBlank(excelInfo.getUploadDate()) && StringUtils.isBlank(excelInfo.getUploadMoney())) {
                     checkWord.add("上传金额不能为空");
                     break;
                 }
+                if (StringUtils.isNotBlank(excelInfo.getUploadDate()) && StringUtils.isNotBlank(excelInfo.getUploadMoney())){
+                    if (new BigDecimal(excelInfo.getUploadMoney()).compareTo(BigDecimal.ZERO) == 0){
+                        checkWord.add("上传金额不能为0");
+                        break;
+                    }
+                }
                 if (StringUtils.isNotBlank(excelInfo.getUploadDate())) {
                     String uploadDate = "";
                     if (isNumber(excelInfo.getUploadDate())) {
@@ -1624,6 +1641,9 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
             List<TwoExcelInfo> infos = importReturn.getInfos();
             for (TwoExcelInfo info : infos) {
                 if (StringUtils.isNotBlank(info.getSecondaryUploadDate()) && StringUtils.isNotBlank(info.getSecondaryUploadMoney())) {
+                    if (StringUtils.isBlank(info.getRemarks())){
+                        info.setRemarks("");
+                    }
                     ScmSpecialRebateVo scmSpecialRebateVo = baseMapper.selectExcel(createOrgSid, info.getRebateTypeValue(), info.getRebateName(), info.getEstimateRebate(), info.getPalceGenDate(), info.getPurchaseSystemName(), info.getBrandName(), info.getRemarks());
                     String secondaryUploadDate = "";
                     if (isNumber(info.getSecondaryUploadDate())) {
@@ -1806,6 +1826,9 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
         }
         if (!importVoList.isEmpty()) {
             for (TwoExcelInfo excelInfo : importVoList) {
+                if (StringUtils.isBlank(excelInfo.getRemarks())){
+                    excelInfo.setRemarks("");
+                }
                 ScmSpecialRebateVo scmSpecialRebateVo = baseMapper.selectExcel(createOrgSid, excelInfo.getRebateTypeValue(), excelInfo.getRebateName(), excelInfo.getEstimateRebate(), excelInfo.getPalceGenDate(), excelInfo.getPurchaseSystemName(), excelInfo.getBrandName(), excelInfo.getRemarks());
                 if (scmSpecialRebateVo == null || StringUtils.isBlank(scmSpecialRebateVo.getSid())) {
                     checkWord.add("返利名称" + excelInfo.getRebateName() + "导入的返利信息不存在");
@@ -1950,13 +1973,21 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                     }
                 }
                 if (StringUtils.isBlank(excelInfo.getSecondaryUploadDate()) && StringUtils.isNotBlank(excelInfo.getSecondaryUploadMoney())) {
-                    checkWord.add("二次上传日期不能为空");
+                    if (new BigDecimal(excelInfo.getSecondaryUploadMoney()).compareTo(BigDecimal.ZERO) != 0){
-                    break;
+                        checkWord.add("二次上传日期不能为空");
+                        break;
+                    }
                 }
                 if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadDate()) && StringUtils.isBlank(excelInfo.getSecondaryUploadMoney())) {
                     checkWord.add("二次上传金额不能为空");
                     break;
                 }
+                if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadDate()) && StringUtils.isNotBlank(excelInfo.getSecondaryUploadMoney())){
+                    if (new BigDecimal(excelInfo.getSecondaryUploadMoney()).compareTo(BigDecimal.ZERO) == 0){
+                        checkWord.add("二次上传金额不能为0");
+                        break;
+                    }
+                }
                 if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadDate())) {
                     String secondaryUploadDate = "";
                     if (isNumber(excelInfo.getSecondaryUploadDate())) {

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

@@ -1784,13 +1784,21 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                     }
                 }
                 if (StringUtils.isBlank(excelInfo.getUploadDate()) && StringUtils.isNotBlank(excelInfo.getUploadMoney())) {
-                    checkWord.add("上传日期不能为空");
+                    if (new BigDecimal(excelInfo.getUploadMoney()).compareTo(BigDecimal.ZERO) != 0){
-                    break;
+                        checkWord.add("上传日期不能为空");
+                        break;
+                    }
                 }
                 if (StringUtils.isNotBlank(excelInfo.getUploadDate()) && StringUtils.isBlank(excelInfo.getUploadMoney())) {
                     checkWord.add("上传金额不能为空");
                     break;
                 }
+                if (StringUtils.isNotBlank(excelInfo.getUploadDate()) && StringUtils.isNotBlank(excelInfo.getUploadMoney())){
+                    if (new BigDecimal(excelInfo.getUploadMoney()).compareTo(BigDecimal.ZERO) == 0){
+                        checkWord.add("上传金额不能为0");
+                        break;
+                    }
+                }
                 if (StringUtils.isNotBlank(excelInfo.getUploadDate())) {
                     String uploadDate = "";
                     if (isNumber(excelInfo.getUploadDate())) {
@@ -2281,13 +2289,21 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                     }
                 }
                 if (StringUtils.isBlank(excelInfo.getSecondaryUploadDate()) && StringUtils.isNotBlank(excelInfo.getSecondaryUploadMoney())) {
-                    checkWord.add("二次上传日期不能为空");
+                    if (new BigDecimal(excelInfo.getSecondaryUploadMoney()).compareTo(BigDecimal.ZERO) != 0){
-                    break;
+                        checkWord.add("二次上传日期不能为空");
+                        break;
+                    }
                 }
                 if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadDate()) && StringUtils.isBlank(excelInfo.getSecondaryUploadMoney())) {
                     checkWord.add("二次上传金额不能为空");
                     break;
                 }
+                if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadDate()) && StringUtils.isNotBlank(excelInfo.getSecondaryUploadMoney())){
+                    if (new BigDecimal(excelInfo.getSecondaryUploadMoney()).compareTo(BigDecimal.ZERO) == 0){
+                        checkWord.add("二次上传金额不能为0");
+                        break;
+                    }
+                }
                 if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadDate())) {
                     String secondaryUploadDate = "";
                     if (isNumber(excelInfo.getSecondaryUploadDate())) {

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java

@@ -121,6 +121,7 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
     private BaseGoodsSkuExtendFeign baseGoodsSkuExtendFeign;
     @Autowired
     private SmsGoodsFeign smsGoodsFeign;
+
     public PagerVo<WmsShelfBillVo> listPage(PagerQuery<WmsShelfBillQuery> pq) {
         WmsShelfBillQuery query = pq.getParams();
         QueryWrapper<WmsShelfBill> qw = new QueryWrapper<>();
@@ -855,7 +856,7 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
                 if (StringUtils.isNotBlank(tjmxSid)) {
                     List<SmsPricestrategyBillGoodstypedetailDetailsVo> data = smsPricesTrategyBillGoodsTypeDetailFeign.selByMainSid(tjmxSid).getData();
                     for (SmsPricestrategyBillGoodstypedetailDetailsVo smsPricestrategyBillGoodstypedetailDetailsVo : data) {
-                         cost = receiptBillDetail.getCost();
+                        cost = receiptBillDetail.getCost();
                         if (cost.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeStart()) != -1 && cost.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeEnd()) != 1) {
                             BigDecimal markupRate = smsPricestrategyBillGoodstypedetailDetailsVo.getMarkupRate();
                             price = cost.add(cost.multiply(markupRate).divide(new BigDecimal("100")));
@@ -958,15 +959,26 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
                         for (WmsInventoryRecord inventoryRecord : wmsInventoryRecordList) {
                             AppRecordListVo.AppRecordListDetailsDto detailsDto = new AppRecordListVo.AppRecordListDetailsDto();
                             detailsDto.setGoodsID(inventoryRecord.getGoodsID());
+                            WmsHouseInfoVo infoVo = wmsWarehouseRackService.selHouseInfoByFullCode(inventoryRecord.getWarehouseRackSid()).getData();
                             String houseName = "";
-                            String rockCode = "";
+                            String areaName = "";
-                            if (StringUtils.isNotBlank(inventoryRecord.getWarehouseName())) {
+                            String rackCode = "";
-                                houseName = inventoryRecord.getWarehouseName();
+                            String zoneName = "";
-                            }
+                            if (null != infoVo) {
-                            if (StringUtils.isNotBlank(inventoryRecord.getWarehouseRackCode())) {
+                                if (StringUtils.isNotBlank(infoVo.getWarehouseName())) {
-                                rockCode = inventoryRecord.getWarehouseRackCode();
+                                    houseName = infoVo.getWarehouseName();
+                                }
+                                if (StringUtils.isNotBlank(infoVo.getWareAreaName())) {
+                                    areaName = infoVo.getWareAreaName();
+                                }
+                                if (StringUtils.isNotBlank(infoVo.getWarehouseRackCode())) {
+                                    rackCode = infoVo.getWarehouseRackCode();
+                                }
+                                if (StringUtils.isNotBlank(infoVo.getWarehouseZoneName())) {
+                                    zoneName = infoVo.getWarehouseZoneName();
+                                }
+                                detailsDto.setHouseName(houseName + "-" + zoneName + "-" + areaName + " " + rackCode);
                             }
-                            detailsDto.setHouseName(houseName + rockCode);
                             detailsDto.setShows(inventoryRecord.getHandlerName() + "于" + sdf.format(inventoryRecord.getCreateTime()) + "上架" + inventoryRecord.getCount().intValue() + inventoryRecord.getUnit());
                             detailsList.add(detailsDto);
                         }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/app/AppRecordListVo.java

@@ -23,7 +23,7 @@ public class AppRecordListVo {
          */
         private String goodsID;
         /**
-         * 库位 库区名+库位码
+         * 仓库-区域-库区 库位码
          */
         private String houseName;
         /**