yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

更改

master
ligaode 2 months ago
parent
ba3e04cd93
commit
aab5a4271a
6 changed files with 94 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateQuery.java
  2. 18
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java
  3. 62
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
  4. 5
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackService.java
  5. 6
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java
  6. 2
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/GoodsTwoListVo.java

16
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateQuery.java
View File

@ -85,6 +85,22 @@ public class ScmSpecialRebateQuery implements Query {
@ApiModelProperty("页面分配数量（0查询分配数量大于0的 1查询所有）")
private String isPage;
@ApiModelProperty("所属年月")
private String palceGenDate;
@ApiModelProperty("预提日期")
private String withholdingDate;
@ApiModelProperty("上传日期")
private String uploadStartDate;
private String uploadEndDate;
@ApiModelProperty("上传状态")
private String uploadState;
@ApiModelProperty("是否调整")
private String isAdjustment;
@ApiModelProperty("是否上传完成")
private String isUploadFinish;
@ApiModelProperty("二次上传状态")
private String secondUploadState;
private String userSid;
private String orgPath;
private String menuUrl;

18
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java
View File

@ -80,6 +80,24 @@ public class ScmVehRebateQuery implements Query {
@ApiModelProperty("采购系统")
private String purchaseSystemName;
@ApiModelProperty("所属年月")
private String palceGenDate;
@ApiModelProperty("预提日期")
private String withholdingDate;
@ApiModelProperty("上传日期")
private String uploadStartDate;
private String uploadEndDate;
@ApiModelProperty("上传状态")
private String uploadState;
@ApiModelProperty("是否调整")
private String isAdjustment;
@ApiModelProperty("是否上传完成")
private String isUploadFinish;
@ApiModelProperty("一次核对状态")
private String onceCheckState;
@ApiModelProperty("二次上传状态")
private String secondUploadState;
private String userSid;
private String orgPath;
private String menuUrl;

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

@ -149,11 +149,53 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
if (StringUtils.isNotBlank(query.getPurchaseSystemName())) {
qw.like("purchaseSystemName", query.getPurchaseSystemName());
}
if (StringUtils.isNotBlank(query.getPalceGenDate())) {
qw.like("palceGenDate", query.getPalceGenDate());
}
if (StringUtils.isNotBlank(query.getWithholdingDate())) {
qw.like("withholdingDate", query.getWithholdingDate());
}
if (StringUtils.isNotBlank(query.getUploadState())) {
if (query.getUploadState().equals("未上传")) {
qw.and(wrapper -> wrapper.eq("uploadDate", "")
.or().isNull("uploadDate")
);
} else {
qw.ne("uploadDate", "");
qw.isNotNull("uploadDate");
}
}
if (StringUtils.isNotBlank(query.getIsAdjustment())) {
qw.like("isAdjustment", query.getIsAdjustment());
}
if (StringUtils.isNotBlank(query.getIsUploadFinish())) {
if (query.getIsUploadFinish().equals("是")) {
qw.eq("estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney", 0);
} else {
qw.ne("estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney", 0);
}
}
if (StringUtils.isNotBlank(query.getOnceCheckState())) {
qw.eq("onceCheckState", query.getOnceCheckState());
}
if (StringUtils.isNotBlank(query.getSecondUploadState())) {
if (query.getSecondUploadState().equals("是")){
//qw.eq()
}
}
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
String uploadStartDate = query.getUploadStartDate();
String uploadEndDate = query.getUploadEndDate();
qw.apply(StringUtils.isNotBlank(uploadStartDate), "date_format (uploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(uploadEndDate), "date_format (uploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')").
or().
apply(StringUtils.isNotBlank(uploadStartDate), "date_format (secondaryUploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(uploadEndDate), "date_format (secondaryUploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')"
);
qw.orderByDesc("createTime");
IPage<ScmVehRebate> page = PagerUtil.queryToPage(pq);
IPage<ScmVehRebateVo> pagging = baseMapper.selectPageVo(page, qw);
@ -161,13 +203,13 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
if ("001".equals(record.getCalculationModeKey())) {
record.setCalculationStandard(record.getCalculationStandard() + "%");
}
if (StringUtils.isNotBlank(record.getSecondaryUploadMoney())){
if (Integer.parseInt(record.getSecondaryUploadMoney()) > 0 && "是".equals(record.getIsAdjustment())){
if (StringUtils.isNotBlank(record.getSecondaryUploadMoney())) {
if (Integer.parseInt(record.getSecondaryUploadMoney()) > 0 && "是".equals(record.getIsAdjustment())) {
record.setSecondCheckState("是");
}else {
} else {
record.setSecondCheckState("否");
}
}else {
} else {
record.setSecondCheckState("否");
}
}
@ -458,13 +500,13 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
} else {//上传状态：已上传
record.setUploadState("1");
}
if (StringUtils.isNotBlank(record.getSecondaryUploadMoney())){
if (Integer.parseInt(record.getSecondaryUploadMoney()) > 0 && "是".equals(record.getIsAdjustment())){
if (StringUtils.isNotBlank(record.getSecondaryUploadMoney())) {
if (Integer.parseInt(record.getSecondaryUploadMoney()) > 0 && "是".equals(record.getIsAdjustment())) {
record.setSecondCheckState("是");
}else {
} else {
record.setSecondCheckState("否");
}
}else {
} else {
record.setSecondCheckState("否");
}
}
@ -2113,9 +2155,9 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
return rb.success();
}
public ResultBean delByVehSid2(String vehSid,String useOrgSid,String key) {
public ResultBean delByVehSid2(String vehSid, String useOrgSid, String key) {
ResultBean rb = ResultBean.fireFail();
baseMapper.delByVehSid2(vehSid,useOrgSid,key);
baseMapper.delByVehSid2(vehSid, useOrgSid, key);
return rb.success();
}

5
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackService.java
View File

@ -42,6 +42,7 @@ public class WmsWarehouseRackService extends MybatisBaseService<WmsWarehouseRack
private WmsWarehouseAreaService wmsWarehouseAreaService;
@Autowired
private WmsWarehouseZoneService wmsWarehouseZoneService;
public ResultBean<PagerVo<WmsWarehouseRackVo>> listPage(PagerQuery<WmsWarehouseRackQuery> pq) {
ResultBean rb = ResultBean.fireFail();
WmsWarehouseRackQuery query = pq.getParams();
@ -272,8 +273,8 @@ public class WmsWarehouseRackService extends MybatisBaseService<WmsWarehouseRack
if (StringUtils.isNotBlank(wmsWarehouseArea.getZoneSid())) {
WmsWarehouseZone wmsWarehouseZone = wmsWarehouseZoneService.fetchBySid(wmsWarehouseArea.getZoneSid());
if (null != wmsWarehouseZone) {
info.setWarehouseZoneName(wmsWarehouseZone.getZoneName());
info.setWarehouseZoneSid(wmsWarehouseZone.getSid());
info.setWarehouseZoneName(wmsWarehouseZone.getZoneName());
info.setWarehouseZoneSid(wmsWarehouseZone.getSid());
}
}

6
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java
View File

@ -766,7 +766,8 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
goodsTwoListVo.setStoreSid(wmsInventory.getWarehouseSid());
goodsTwoListVo.setCount(wmsInventory.getCount().toString());
goodsTwoListVo.setMaxCount(wmsInventory.getCount().toString());
goodsTwoListVo.setHouseInfo("保内-" + wmsInventory.getWarehouseName() + " " + wmsInventory.getWarehouseRackCode());
WmsHouseInfoVo houseInfoVo = wmsWarehouseRackService.selHouseInfoByFullCode(wmsInventory.getWarehouseRackSid()).getData();
goodsTwoListVo.setHouseInfo(houseInfoVo.getWarehouseZoneName() + "-" + houseInfoVo.getWareAreaName() + " " + wmsInventory.getWarehouseRackCode());
if (wmsInventory.getCount().compareTo(BigDecimal.ONE) == 0) {
goodsTwoListVo.setForbid(true);
}
@ -792,7 +793,8 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
goodsTwoListVo.setStoreSid(wmsInventory.getWarehouseSid());
goodsTwoListVo.setCount(wmsInventory.getCount().toString());
goodsTwoListVo.setMaxCount(wmsInventory.getCount().toString());
goodsTwoListVo.setHouseInfo("保内-" + wmsInventory.getWarehouseName() + " " + wmsInventory.getWarehouseRackCode());
WmsHouseInfoVo houseInfoVo = wmsWarehouseRackService.selHouseInfoByFullCode(wmsInventory.getWarehouseRackSid()).getData();
goodsTwoListVo.setHouseInfo(houseInfoVo.getWarehouseZoneName() + "-" + houseInfoVo.getWareAreaName() + " " + wmsInventory.getWarehouseRackCode());
if (wmsInventory.getCount().compareTo(BigDecimal.ONE) == 0) {
goodsTwoListVo.setForbid(true);
}

2
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/GoodsTwoListVo.java
View File

@ -38,7 +38,7 @@ public class GoodsTwoListVo {
*/
private String maxCount;
/**
* 格式例：保内-仓库 库位编码
* 格式例：保内-库区 库位编码
*/
private String houseInfo;
/**

Write Preview
Loading…
Cancel
Save