Browse Source

更改

master
ligaode 3 months ago
parent
commit
0f9ffd2cca
  1. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
  2. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java
  3. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionFeign.java
  4. 39
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java
  5. 39
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java
  6. 1
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml
  7. 35
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java
  8. 40
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java
  9. 35
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java
  10. 1
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml
  11. 12
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
  12. 35
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java
  13. 38
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java
  14. 4
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java
  15. 2
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java
  16. 2
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyService.java
  17. 54
      yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInitialDetailRest.java
  18. 35
      yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInitialRest.java
  19. 51
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitial/WmsInitial.java
  20. 50
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitial/WmsInitialDetailsVo.java
  21. 50
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitial/WmsInitialDto.java
  22. 34
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitial/WmsInitialMapper.java
  23. 6
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitial/WmsInitialMapper.xml
  24. 34
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitial/WmsInitialService.java
  25. 93
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetail.java
  26. 93
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailDetailsVo.java
  27. 95
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailDto.java
  28. 39
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailMapper.java
  29. 9
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailMapper.xml
  30. 93
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailQuery.java
  31. 47
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailService.java
  32. 74
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailVo.java

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@ -657,7 +657,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
厂家采购订金:005定金厂家采购车款:车辆功能厂家销售/回款通路
"外采订金:005定金
外采车款:002外采"*/
if (!"厂家采购".equals(finPaymentrecord.getCostTypeValue())) {
if (!"厂家采购".equals(finPaymentrecord.getCostTypeValue()) && !"厂家车款".equals(finPaymentrecord.getCostTypeValue())) {
apPayBill.setF_PAEZ_AssistantKey(finPaymentrecord.getCostTypeKey());
apPayBill.setF_PAEZ_AssistantType("payCostType");
} else {

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java

@ -620,7 +620,7 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
}
if (StringUtils.isNotBlank(excelInfo.getPeriod())) {
String period = excelInfo.getPeriod();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(period).matches();
if (!matches) {
checkWord.add("期数必须为数字");

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionFeign.java

@ -65,12 +65,12 @@ public interface ScmCollectionRebateDistributionFeign {
@PostMapping("/save")
@ResponseBody
public ResultBean save(@RequestBody ScmCollectionRebateDistributionDto dto);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@ResponseBody
public ResultBean delBySids(@RequestBody String[] sids);
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody

39
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java

@ -67,6 +67,9 @@ import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.messagecenter.api.message.MessageFeign;
import com.yxt.messagecenter.api.message.MessageFlowVo;
import com.yxt.messagecenter.api.message.MessageFlowableQuery;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -103,7 +106,7 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService<Scm
@Autowired
private ScmCollectionrebateCheckapplydetailService scmCollectionrebateCheckapplydetailService;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
private MessageFeign messageFeign;
@Autowired
private FlowableFeign flowableFeign;
@Autowired
@ -265,18 +268,6 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService<Scm
public ResultBean submitCollectionRebateCheckApply(SubmitScmCollectionRebateCheckApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
//根据staffSid获取用户的组织全路径
ResultBean<SysStaffOrg> orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
if (!orgByStaffSid.getSuccess()) {
return rb.setMsg(orgByStaffSid.getMsg());
}
//用户的组织全路径
String orgSidPath = orgByStaffSid.getData().getOrgSidPath();
ScmCollectionrebateCheckapply scmCollectionrebateCheckapply = fetchBySid(dto.getSid());
int r = submitBusinessData(dto, scmCollectionrebateCheckapply);
if (r == 3) {
@ -302,7 +293,7 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService<Scm
appMap.put("sid", businessSid);
variables.put("app", appMap);
//用户的部门全路径sid
bv.setOrgSidPath(orgSidPath);
bv.setOrgSidPath(dto.getOrgPath());
//业务sid
bv.setBusinessSid(businessSid);
//用户sid
@ -537,17 +528,37 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService<Scm
public ResultBean complete(BusinessVariables bv) {
ResultBean rb = ResultBean.fireFail();
ScmCollectionrebateCheckapply scmCollectionrebateCheckapply = fetchBySid(bv.getBusinessSid());
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", bv.getBusinessSid());
variables.put("app", appMap);
List<String> collectionRebateSids = scmCollectionrebateCheckapplydetailService.fetchCollectionReBateSidByMainSid(bv.getBusinessSid());
if (bv.getTaskId().equals(scmCollectionrebateCheckapply.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
UpdateFlowFieldVo ufVo = resultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
for (String collectionRebateSid : collectionRebateSids) {
scmCollectionRebateService.updateState(collectionRebateSid, 4);
}
} else {
//极光推送
scmCollectionrebateCheckapply = fetchBySid(bv.getBusinessSid());
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcDefId(scmCollectionrebateCheckapply.getProcDefId());
ufVo.setProcInsId(scmCollectionrebateCheckapply.getProcInstId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
messageFlowableQuery.setModuleName("回款返利核对申请");
messageFlowableQuery.setMsgContent(scmCollectionrebateCheckapply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("回款返利核对申请");
messageFeign.pushMessage(messageFlowableQuery);
}
return rb.success().setData(resultBean.getData());
} else {

39
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java

@ -72,6 +72,9 @@ import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.messagecenter.api.message.MessageFeign;
import com.yxt.messagecenter.api.message.MessageFlowVo;
import com.yxt.messagecenter.api.message.MessageFlowableQuery;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -101,7 +104,7 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService<ScmC
@Autowired
private ScmCollectionRebateDistributionService scmCollectionRebateDistributionService;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
private MessageFeign messageFeign;
@Autowired
private FlowableFeign flowableFeign;
@Autowired
@ -281,18 +284,6 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService<ScmC
public ResultBean submitCollectionRebateWithApply(SubmitScmCollectionRebateWithApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
//根据staffSid获取用户的组织全路径
ResultBean<SysStaffOrg> orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
if (!orgByStaffSid.getSuccess()) {
return rb.setMsg(orgByStaffSid.getMsg());
}
//用户的组织全路径
String orgSidPath = orgByStaffSid.getData().getOrgSidPath();
ScmCollectionRebateWithApply scmCollectionRebateWithApply = fetchBySid(dto.getSid());
int r = submitBusinessData(dto, scmCollectionRebateWithApply);
if (r == 3) {
@ -318,7 +309,7 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService<ScmC
appMap.put("sid", businessSid);
variables.put("app", appMap);
//用户的部门全路径sid
bv.setOrgSidPath(orgSidPath);
bv.setOrgSidPath(dto.getOrgPath());
//业务sid
bv.setBusinessSid(businessSid);
//用户sid
@ -495,12 +486,17 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService<ScmC
public ResultBean complete(BusinessVariables bv) {
ResultBean rb = ResultBean.fireFail();
ScmCollectionRebateWithApply scmCollectionRebateWithApply = fetchBySid(bv.getBusinessSid());
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", bv.getBusinessSid());
variables.put("app", appMap);
List<String> collectionRebateSids = scmCollectionRebateWithService.fetchCollectionReBateSidByMainSid(bv.getBusinessSid());
if (bv.getTaskId().equals(scmCollectionRebateWithApply.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
UpdateFlowFieldVo ufVo = resultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
for (String collectionRebateSid : collectionRebateSids) {
@ -521,6 +517,21 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService<ScmC
}
}
pushCollectionRebateWithVoucher(bv.getBusinessSid()); //回款返利预提凭证
} else {
//极光推送
scmCollectionRebateWithApply = fetchBySid(bv.getBusinessSid());
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcDefId(scmCollectionRebateWithApply.getProcDefId());
ufVo.setProcInsId(scmCollectionRebateWithApply.getProcInstId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
messageFlowableQuery.setModuleName("回款返利预提申请");
messageFlowableQuery.setMsgContent(scmCollectionRebateWithApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("回款返利预提申请");
messageFeign.pushMessage(messageFlowableQuery);
}
return rb.success().setData(resultBean.getData());
} else {

1
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml

@ -30,6 +30,7 @@
)
OR (
onceCheckState = 0
AND uploadDate != ''
AND uploadDate IS NOT NULL
))
</select>

35
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java

@ -76,6 +76,8 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.messagecenter.api.message.Message;
import com.yxt.messagecenter.api.message.MessageFeign;
import com.yxt.messagecenter.api.message.MessageFlowVo;
import com.yxt.messagecenter.api.message.MessageFlowableQuery;
import com.yxt.messagecenter.api.messagelist.MessageList;
import com.yxt.messagecenter.api.messagelist.MessageListFeign;
import org.apache.commons.lang3.StringUtils;
@ -326,18 +328,6 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
public ResultBean submitSpecialRebateCheckApply(SubmitScmSpecialRebateCheckApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
//根据staffSid获取用户的组织全路径
ResultBean<SysStaffOrg> orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
if (!orgByStaffSid.getSuccess()) {
return rb.setMsg(orgByStaffSid.getMsg());
}
//用户的组织全路径
String orgSidPath = orgByStaffSid.getData().getOrgSidPath();
ScmSpecialrebateCheckapply scmSpecialrebateCheckapply = fetchBySid(dto.getSid());
int r = submitBusinessData(dto, scmSpecialrebateCheckapply);
if (r == 3) {
@ -363,7 +353,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
appMap.put("sid", businessSid);
variables.put("app", appMap);
//用户的部门全路径sid
bv.setOrgSidPath(orgSidPath);
bv.setOrgSidPath(dto.getOrgPath());
//业务sid
bv.setBusinessSid(businessSid);
//用户sid
@ -867,6 +857,9 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
ScmSpecialrebateCheckapply scmSpecialrebateCheckapply = fetchBySid(bv.getBusinessSid());
bv.setModelId(scmSpecialrebateCheckapply.getProcDefId());
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", bv.getBusinessSid());
variables.put("app", appMap);
//========================================
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(bv.getModelId());
@ -879,6 +872,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
UpdateFlowFieldVo ufVo = resultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
List<ScmSpecialrebateCheckapplydetailVo> scmSpecialrebateCheckapplydetailVos = scmSpecialrebateCheckapplydetailService.selByMainSid(bv.getBusinessSid());
@ -895,6 +889,21 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
}
pushSpecialRebateWithVoucher(bv.getBusinessSid());
} else {
//极光推送
scmSpecialrebateCheckapply = fetchBySid(bv.getBusinessSid());
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcDefId(scmSpecialrebateCheckapply.getProcDefId());
ufVo.setProcInsId(scmSpecialrebateCheckapply.getProcInstId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
messageFlowableQuery.setModuleName("专项返利核对申请");
messageFlowableQuery.setMsgContent(scmSpecialrebateCheckapply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("专项返利核对申请");
messageFeign.pushMessage(messageFlowableQuery);
}
return rb.success().setData(resultBean.getData());
} else {

40
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java

@ -58,6 +58,9 @@ import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapply;
import com.yxt.anrui.scm.biz.scmspecialrebate.ScmSpecialRebateService;
import com.yxt.anrui.scm.biz.scmspecialrebatedistributedetail.ScmSpecialrebatedistributedetailService;
import com.yxt.anrui.scm.biz.scmspecialrebatevehs.ScmSpecialrebateVehsService;
import com.yxt.messagecenter.api.message.MessageFeign;
import com.yxt.messagecenter.api.message.MessageFlowVo;
import com.yxt.messagecenter.api.message.MessageFlowableQuery;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -100,8 +103,6 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService<ScmSpe
@Autowired
private ScmSpecialrebateVehsService scmSpecialrebateVehsService;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private FlowableFeign flowableFeign;
@Autowired
private FlowTaskFeign flowTaskFeign;
@ -113,6 +114,8 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService<ScmSpe
private ScmSpecialRebateService scmSpecialRebateService;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private MessageFeign messageFeign;
public PagerVo<ScmSpecialrebatedistributeVo> listPageVo(PagerQuery<ScmSpecialrebatedistributeQuery> pq) {
ScmSpecialrebatedistributeQuery query = pq.getParams();
@ -292,18 +295,6 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService<ScmSpe
public ResultBean submitSpecialRebatedistribute(SubmitScmSpecialRebatedistributeDto dto) {
ResultBean rb = ResultBean.fireFail();
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
//根据staffSid获取用户的组织全路径
ResultBean<SysStaffOrg> orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
if (!orgByStaffSid.getSuccess()) {
return rb.setMsg(orgByStaffSid.getMsg());
}
//用户的组织全路径
String orgSidPath = orgByStaffSid.getData().getOrgSidPath();
ScmSpecialrebatedistribute scmSpecialrebatedistribute = fetchBySid(dto.getSid());
int r = submitBusinessData(dto, scmSpecialrebatedistribute);
if (r == 3) {
@ -329,7 +320,7 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService<ScmSpe
appMap.put("sid", businessSid);
variables.put("app", appMap);
//用户的部门全路径sid
bv.setOrgSidPath(orgSidPath);
bv.setOrgSidPath(dto.getOrgPath());
//业务sid
bv.setBusinessSid(businessSid);
//用户sid
@ -402,6 +393,9 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService<ScmSpe
ScmSpecialrebatedistribute scmSpecialrebatedistribute = fetchBySid(bv.getBusinessSid());
bv.setModelId(scmSpecialrebatedistribute.getProcDefId());
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", bv.getBusinessSid());
variables.put("app", appMap);
//========================================
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(bv.getModelId());
@ -414,9 +408,25 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService<ScmSpe
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
UpdateFlowFieldVo ufVo = resultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
scmSpecialRebateService.updateState(bv.getBusinessSid(), 6);
} else {
//极光推送
scmSpecialrebatedistribute = fetchBySid(bv.getBusinessSid());
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcDefId(scmSpecialrebatedistribute.getProcDefId());
ufVo.setProcInsId(scmSpecialrebatedistribute.getProcInstId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
messageFlowableQuery.setModuleName("专项返利分配申请");
messageFlowableQuery.setMsgContent(scmSpecialrebatedistribute.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("专项返利分配申请");
messageFeign.pushMessage(messageFlowableQuery);
}
return rb.success().setData(resultBean.getData());
} else {

35
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java

@ -76,6 +76,8 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.messagecenter.api.message.Message;
import com.yxt.messagecenter.api.message.MessageFeign;
import com.yxt.messagecenter.api.message.MessageFlowVo;
import com.yxt.messagecenter.api.message.MessageFlowableQuery;
import com.yxt.messagecenter.api.messagelist.MessageList;
import com.yxt.messagecenter.api.messagelist.MessageListFeign;
import org.apache.commons.lang3.StringUtils;
@ -323,18 +325,6 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
public ResultBean submitSpecialRebateWithApply(SubmitScmSpecialRebateWithApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
//根据staffSid获取用户的组织全路径
ResultBean<SysStaffOrg> orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
if (!orgByStaffSid.getSuccess()) {
return rb.setMsg(orgByStaffSid.getMsg());
}
//用户的组织全路径
String orgSidPath = orgByStaffSid.getData().getOrgSidPath();
ScmSpecialRebateWithApply scmSpecialRebateWithApply = fetchBySid(dto.getSid());
int r = submitBusinessData(dto, scmSpecialRebateWithApply);
if (r == 3) {
@ -360,7 +350,7 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
appMap.put("sid", businessSid);
variables.put("app", appMap);
//用户的部门全路径sid
bv.setOrgSidPath(orgSidPath);
bv.setOrgSidPath(dto.getOrgPath());
//业务sid
bv.setBusinessSid(businessSid);
//用户sid
@ -572,6 +562,9 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
ScmSpecialRebateWithApply scmSpecialRebateWithApply = fetchBySid(bv.getBusinessSid());
bv.setModelId(scmSpecialRebateWithApply.getProcDefId());
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", bv.getBusinessSid());
variables.put("app", appMap);
//========================================
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(bv.getModelId());
@ -585,6 +578,7 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
UpdateFlowFieldVo ufVo = resultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
for (String specialRebateSid : specialRebateSids) {
@ -592,6 +586,21 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
scmSpecialRebateService.updateWithholdingDateBySid(specialRebateSid,scmSpecialRebateWithApply.getWithApply());
}
pushSpecialRebateWithVoucher(bv.getBusinessSid());
} else {
//极光推送
scmSpecialRebateWithApply = fetchBySid(bv.getBusinessSid());
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcDefId(scmSpecialRebateWithApply.getProcDefId());
ufVo.setProcInsId(scmSpecialRebateWithApply.getProcInstId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
messageFlowableQuery.setModuleName("专项返利预提申请");
messageFlowableQuery.setMsgContent(scmSpecialRebateWithApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("专项返利预提申请");
messageFeign.pushMessage(messageFlowableQuery);
}
return rb.success().setData(resultBean.getData());
} else {

1
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml

@ -35,6 +35,7 @@
)
OR (
onceCheckState = 0
AND uploadDate != ''
AND uploadDate IS NOT NULL
))
</select>

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

@ -1033,7 +1033,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
}
Sheet sheet = wb.getSheetAt(0);
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
VehRebateOneExcelInfo importReturn = getSheetValOne(sheet, resultCell, userSid, useOrgSid);
VehRebateOneExcelInfo importReturn = getSheetValOne(sheet, resultCell, orgPath, useOrgSid);
if (StringUtils.isNotBlank(importReturn.getCheckInfo())) {
return rb.setMsg(importReturn.getCheckInfo());
} else {
@ -1053,7 +1053,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
}
}
private VehRebateOneExcelInfo getSheetValOne(Sheet sheet, int[] resultCell, String userSid, String useOrgSid) {
private VehRebateOneExcelInfo getSheetValOne(Sheet sheet, int[] resultCell, String orgPath, String useOrgSid) {
VehRebateOneExcelInfo importReturn = new VehRebateOneExcelInfo();
List<OneExcelInfo> importVoList = new ArrayList<>();
Set<String> checkWord = new HashSet<>();
@ -1219,7 +1219,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
PagerQuery<BaseVehicleRebateQuery> pq = new PagerQuery<>();
BaseVehicleRebateQuery params = new BaseVehicleRebateQuery();
params.setVinNo(excelInfo.getVinNo());
params.setUserSid(userSid);
params.setOrgSid(orgPath);
pq.setParams(params);
PagerVo<BaseVehicleRebateVo> data = baseVehicleFeign.vehicleRebateList(pq).getData();
if (data.getRecords().size() == 0) {
@ -1473,7 +1473,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
}
Sheet sheet = wb.getSheetAt(0);
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
VehRebateTwoExcelInfo importReturn = getSheetValTwo(sheet, resultCell, userSid, useOrgSid);
VehRebateTwoExcelInfo importReturn = getSheetValTwo(sheet, resultCell, orgPath, useOrgSid);
if (StringUtils.isNotBlank(importReturn.getCheckInfo())) {
return rb.setMsg(importReturn.getCheckInfo());
} else {
@ -1493,7 +1493,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
}
}
private VehRebateTwoExcelInfo getSheetValTwo(Sheet sheet, int[] resultCell, String userSid, String useOrgSid) {
private VehRebateTwoExcelInfo getSheetValTwo(Sheet sheet, int[] resultCell, String orgPath, String useOrgSid) {
VehRebateTwoExcelInfo importReturn = new VehRebateTwoExcelInfo();
List<TwoExcelInfo> importVoList = new ArrayList<>();
Set<String> checkWord = new HashSet<>();
@ -1677,7 +1677,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
PagerQuery<BaseVehicleRebateQuery> pq = new PagerQuery<>();
BaseVehicleRebateQuery params = new BaseVehicleRebateQuery();
params.setVinNo(excelInfo.getVinNo());
params.setUserSid(userSid);
params.setOrgSid(orgPath);
pq.setParams(params);
PagerVo<BaseVehicleRebateVo> data = baseVehicleFeign.vehicleRebateList(pq).getData();
if (data.getRecords().size() == 0) {

35
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java

@ -80,6 +80,8 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.messagecenter.api.message.Message;
import com.yxt.messagecenter.api.message.MessageFeign;
import com.yxt.messagecenter.api.message.MessageFlowVo;
import com.yxt.messagecenter.api.message.MessageFlowableQuery;
import com.yxt.messagecenter.api.messagelist.MessageList;
import com.yxt.messagecenter.api.messagelist.MessageListFeign;
import org.apache.commons.lang3.StringUtils;
@ -350,18 +352,6 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
public ResultBean submitVehRebateCheckApply(SubmitScmVehRebateCheckApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
//根据staffSid获取用户的组织全路径
ResultBean<SysStaffOrg> orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
if (!orgByStaffSid.getSuccess()) {
return rb.setMsg(orgByStaffSid.getMsg());
}
//用户的组织全路径
String orgSidPath = orgByStaffSid.getData().getOrgSidPath();
ScmVehrebateCheckapply scmVehrebateCheckapply = fetchBySid(dto.getSid());
int r = submitBusinessData(dto, scmVehrebateCheckapply);
if (r == 3) {
@ -387,7 +377,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
appMap.put("sid", businessSid);
variables.put("app", appMap);
//用户的部门全路径sid
bv.setOrgSidPath(orgSidPath);
bv.setOrgSidPath(dto.getOrgPath());
//业务sid
bv.setBusinessSid(businessSid);
//用户sid
@ -471,6 +461,9 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
ScmVehrebateCheckapply scmVehrebateCheckapply = fetchBySid(bv.getBusinessSid());
bv.setModelId(scmVehrebateCheckapply.getProcDefId());
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", bv.getBusinessSid());
variables.put("app", appMap);
//========================================
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(bv.getModelId());
@ -483,6 +476,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
UpdateFlowFieldVo ufVo = resultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
List<ScmVehrebateCheckapplydetailVo> scmVehrebateCheckapplydetailVos = scmVehrebateCheckapplydetailService.selByMainSid(bv.getBusinessSid());
@ -497,6 +491,21 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
scmVehRebateService.updateOnceCheckState(scmVehrebateCheckapplydetailVo.getVehRebateSid(), 1);
}
pushVehRebateWithVoucher(bv.getBusinessSid()); //推送返利核对凭证
} else {
//极光推送
scmVehrebateCheckapply = fetchBySid(bv.getBusinessSid());
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcDefId(scmVehrebateCheckapply.getProcDefId());
ufVo.setProcInsId(scmVehrebateCheckapply.getProcInstId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
messageFlowableQuery.setModuleName("单车返利核对申请");
messageFlowableQuery.setMsgContent(scmVehrebateCheckapply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("单车返利核对申请");
messageFeign.pushMessage(messageFlowableQuery);
}
return rb.success().setData(resultBean.getData());
} else {

38
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java

@ -81,6 +81,8 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.messagecenter.api.message.Message;
import com.yxt.messagecenter.api.message.MessageFeign;
import com.yxt.messagecenter.api.message.MessageFlowVo;
import com.yxt.messagecenter.api.message.MessageFlowableQuery;
import com.yxt.messagecenter.api.messagelist.MessageList;
import com.yxt.messagecenter.api.messagelist.MessageListFeign;
import org.apache.commons.lang3.StringUtils;
@ -147,6 +149,7 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
private MessageListFeign messageListFeign;
@Autowired
private SysParameterFeign sysParameterFeign;
private QueryWrapper<ScmVehRebateWithApply> createQueryWrapper(ScmVehRebateWithApplyQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@ -337,18 +340,6 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
public ResultBean submitVehRebateWithApply(SubmitScmVehRebateWithApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
//根据staffSid获取用户的组织全路径
ResultBean<SysStaffOrg> orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
if (!orgByStaffSid.getSuccess()) {
return rb.setMsg(orgByStaffSid.getMsg());
}
//用户的组织全路径
String orgSidPath = orgByStaffSid.getData().getOrgSidPath();
ScmVehRebateWithApply scmVehRebateWithApply = fetchBySid(dto.getSid());
int r = submitBusinessData(dto, scmVehRebateWithApply);
if (r == 3) {
@ -374,7 +365,7 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
appMap.put("sid", businessSid);
variables.put("app", appMap);
//用户的部门全路径sid
bv.setOrgSidPath(orgSidPath);
bv.setOrgSidPath(dto.getOrgPath());
//业务sid
bv.setBusinessSid(businessSid);
//用户sid
@ -576,7 +567,7 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
BigDecimal expectSuppCost = BigDecimal.ZERO;//其中抵顶
BigDecimal pushMoney = BigDecimal.ZERO;//推送费用
if (StringUtils.isNotBlank(rebate.getEstimateRebate())) {
esRebate = new BigDecimal(rebate.getEstimateRebate());
esRebate = new BigDecimal(rebate.getEstimateRebate());
}
if (rebate.getExpectTreatCost() != null) {
expectTreatCost = rebate.getExpectTreatCost();
@ -664,6 +655,9 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
ScmVehRebateWithApply scmVehRebateWithApply = fetchBySid(bv.getBusinessSid());
bv.setModelId(scmVehRebateWithApply.getProcDefId());
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", bv.getBusinessSid());
variables.put("app", appMap);
//========================================
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(bv.getModelId());
@ -677,6 +671,7 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
UpdateFlowFieldVo ufVo = resultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
for (String vehRebateSid : vehRebateSids) {
@ -685,6 +680,21 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
}
//推送单车返利预提凭证
pushVehRebateWithVoucher(bv.getBusinessSid());
} else {
//极光推送
scmVehRebateWithApply = fetchBySid(bv.getBusinessSid());
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
ufVo.setProcDefId(scmVehRebateWithApply.getProcDefId());
ufVo.setProcInsId(scmVehRebateWithApply.getProcInstId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
messageFlowableQuery.setModuleName("单车返利预提申请");
messageFlowableQuery.setMsgContent(scmVehRebateWithApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("单车返利预提申请");
messageFeign.pushMessage(messageFlowableQuery);
}
return rb.success().setData(resultBean.getData());
} else {

4
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java

@ -1037,7 +1037,7 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
}
if (StringUtils.isNotBlank(excelInfoBkVo.getAmount())) {
String amount = excelInfoBkVo.getAmount();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(amount).matches();
if (!matches) {
checkWord.add("金额必须为数字");
@ -1178,7 +1178,7 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
}
if (StringUtils.isNotBlank(excelInfoKkVo.getAmount())) {
String amount = excelInfoKkVo.getAmount();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(amount).matches();
if (!matches) {
checkWord.add("金额必须为数字");

2
yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java

@ -808,7 +808,7 @@ public class AsOldpartreturnApplyService extends MybatisBaseService<AsOldpartret
}
if (StringUtils.isNotBlank(excelInfo.getNeedReturnCount().toString())) {
String count = excelInfo.getNeedReturnCount().toString();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(count).matches();
if (!matches) {
checkWord.add("需返厂数量必须为数字");

2
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyService.java

@ -44,6 +44,7 @@ import com.yxt.common.core.result.ResultBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@ -75,6 +76,7 @@ public class AdExpatriatesHomeApplyService extends MybatisBaseService<AdExpatria
adExpatriatesHomeApplyVo.setJobValue(staffPostVos.get(0).getName());
}
adExpatriatesHomeApplyVo.setOrgSidPath(orgPath);
adExpatriatesHomeApplyVo.setExpectCost(new BigDecimal("0"));
return rb.success().setData(adExpatriatesHomeApplyVo);
}

54
yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInitialDetailRest.java

@ -0,0 +1,54 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.wms.apiadmin.inventroy;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.wms.biz.inventory.wmsinitialdetail.WmsInitialDetailQuery;
import com.yxt.wms.biz.inventory.wmsinitialdetail.WmsInitialDetailService;
import com.yxt.wms.biz.inventory.wmsinitialdetail.WmsInitialDetailVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@Api(tags = "期初上架-明细")
@RestController
@RequestMapping("v1/wmsinitialdetail")
public class WmsInitialDetailRest {
@Autowired
private WmsInitialDetailService wmsInitialDetailService;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<WmsInitialDetailVo>> listPage(@RequestBody PagerQuery<WmsInitialDetailQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<WmsInitialDetailVo> pv = wmsInitialDetailService.listPageVo(pq);
return rb.success().setData(pv);
}
}

35
yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInitialRest.java

@ -0,0 +1,35 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.wms.apiadmin.inventroy;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.*;
@Api(tags = "期初上架")
@RestController
@RequestMapping("v1/wmsinitial")
public class WmsInitialRest {
}

51
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitial/WmsInitial.java

@ -0,0 +1,51 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.wms.biz.inventory.wmsinitial;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "期初上架", description = "期初上架")
@TableName("wms_initial")
public class WmsInitial extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("部门sid")
private String deptSid; // 部门sid
@ApiModelProperty("部门名称")
private String deptName; // 部门名称
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称
}

50
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitial/WmsInitialDetailsVo.java

@ -0,0 +1,50 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.wms.biz.inventory.wmsinitial;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "期初上架 视图数据详情", description = "期初上架 视图数据详情")
public class WmsInitialDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("部门sid")
private String deptSid; // 部门sid
@ApiModelProperty("部门名称")
private String deptName; // 部门名称
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称
}

50
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitial/WmsInitialDto.java

@ -0,0 +1,50 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.wms.biz.inventory.wmsinitial;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "期初上架 数据传输对象", description = "期初上架 数据传输对象")
public class WmsInitialDto implements Dto {
private String sid; // sid
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("部门sid")
private String deptSid; // 部门sid
@ApiModelProperty("部门名称")
private String deptName; // 部门名称
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称
}

34
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitial/WmsInitialMapper.java

@ -0,0 +1,34 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.wms.biz.inventory.wmsinitial;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface WmsInitialMapper extends BaseMapper<WmsInitial> {
}

6
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitial/WmsInitialMapper.xml

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.wms.biz.inventory.wmsinitial.WmsInitialMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
</mapper>

34
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitial/WmsInitialService.java

@ -0,0 +1,34 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.wms.biz.inventory.wmsinitial;
import com.yxt.common.base.service.MybatisBaseService;
import org.springframework.stereotype.Service;
@Service
public class WmsInitialService extends MybatisBaseService<WmsInitialMapper, WmsInitial> {
}

93
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetail.java

@ -0,0 +1,93 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.wms.biz.inventory.wmsinitialdetail;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "期初上架-明细", description = "期初上架-明细")
@TableName("wms_initial_detail")
public class WmsInitialDetail extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("商品spuSid")
private String goodsSpuSid; // 商品spuSid
@ApiModelProperty("商品spu名称")
private String goodsSpuName; // 商品spu名称
@ApiModelProperty("商品skuSid")
private String goodsSkuSid; // 商品skuSid
@ApiModelProperty("商品Sku名称")
private String goodsSkuTitle; // 商品Sku名称
@ApiModelProperty("图号")
private String goodsSkuCode; // 图号
@ApiModelProperty("规格型号")
private String goodsSkuOwnSpec; // 规格型号
@ApiModelProperty("单位")
private String unit; // 单位
@ApiModelProperty("数量")
private BigDecimal num; // 数量
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
private String brandName; // 品牌名称
@ApiModelProperty("厂家sid")
private String manufacturerSid; // 厂家sid
@ApiModelProperty("厂家名称")
private String manufacturerName; // 厂家名称
@ApiModelProperty("供应商sid")
private String supplierSid; // 供应商sid
@ApiModelProperty("供应商名称")
private String supplierName; // 供应商名称
@ApiModelProperty("销售指导价")
private BigDecimal saleGuidePrice; // 销售指导价
@ApiModelProperty("入库单价")
private BigDecimal inCost; // 入库单价
@ApiModelProperty("税率")
private String taxRate; // 税率
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("首次入库日期")
private Date firstInDate; // 首次入库日期
@ApiModelProperty("商品类别sid")
private String goodsTypeSid; // 商品类别sid
@ApiModelProperty("商品类别编码")
private String goodsTypeCode; // 商品类别编码
@ApiModelProperty("商品类别名称")
private String goodsTypeName; // 商品类别名称
@ApiModelProperty("已上架数量")
private BigDecimal listNum; // 已上架数量
@ApiModelProperty("是否为一物一码(0是,1否)")
private Integer isYwym; // 是否为一物一码(0是,1否)
}

93
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailDetailsVo.java

@ -0,0 +1,93 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.wms.biz.inventory.wmsinitialdetail;
import com.yxt.common.core.vo.Vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "期初上架-明细 视图数据详情", description = "期初上架-明细 视图数据详情")
public class WmsInitialDetailDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("商品spuSid")
private String goodsSpuSid; // 商品spuSid
@ApiModelProperty("商品spu名称")
private String goodsSpuName; // 商品spu名称
@ApiModelProperty("商品skuSid")
private String goodsSkuSid; // 商品skuSid
@ApiModelProperty("商品Sku名称")
private String goodsSkuTitle; // 商品Sku名称
@ApiModelProperty("图号")
private String goodsSkuCode; // 图号
@ApiModelProperty("规格型号")
private String goodsSkuOwnSpec; // 规格型号
@ApiModelProperty("单位")
private String unit; // 单位
@ApiModelProperty("数量")
private BigDecimal num; // 数量
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
private String brandName; // 品牌名称
@ApiModelProperty("厂家sid")
private String manufacturerSid; // 厂家sid
@ApiModelProperty("厂家名称")
private String manufacturerName; // 厂家名称
@ApiModelProperty("供应商sid")
private String supplierSid; // 供应商sid
@ApiModelProperty("供应商名称")
private String supplierName; // 供应商名称
@ApiModelProperty("销售指导价")
private BigDecimal saleGuidePrice; // 销售指导价
@ApiModelProperty("入库单价")
private BigDecimal inCost; // 入库单价
@ApiModelProperty("税率")
private String taxRate; // 税率
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("首次入库日期")
private Date firstInDateStart; // 首次入库日期
private Date firstInDateEnd; // 首次入库日期
@ApiModelProperty("商品类别sid")
private String goodsTypeSid; // 商品类别sid
@ApiModelProperty("商品类别编码")
private String goodsTypeCode; // 商品类别编码
@ApiModelProperty("商品类别名称")
private String goodsTypeName; // 商品类别名称
@ApiModelProperty("已上架数量")
private BigDecimal listNum; // 已上架数量
@ApiModelProperty("是否为一物一码(0是,1否)")
private Integer isYwym; // 是否为一物一码(0是,1否)
}

95
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailDto.java

@ -0,0 +1,95 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.wms.biz.inventory.wmsinitialdetail;
import com.yxt.common.core.dto.Dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "期初上架-明细 数据传输对象", description = "期初上架-明细 数据传输对象")
public class WmsInitialDetailDto implements Dto {
private String sid; // sid
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("商品spuSid")
private String goodsSpuSid; // 商品spuSid
@ApiModelProperty("商品spu名称")
private String goodsSpuName; // 商品spu名称
@ApiModelProperty("商品skuSid")
private String goodsSkuSid; // 商品skuSid
@ApiModelProperty("商品Sku名称")
private String goodsSkuTitle; // 商品Sku名称
@ApiModelProperty("图号")
private String goodsSkuCode; // 图号
@ApiModelProperty("规格型号")
private String goodsSkuOwnSpec; // 规格型号
@ApiModelProperty("单位")
private String unit; // 单位
@ApiModelProperty("数量")
private BigDecimal num; // 数量
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
private String brandName; // 品牌名称
@ApiModelProperty("厂家sid")
private String manufacturerSid; // 厂家sid
@ApiModelProperty("厂家名称")
private String manufacturerName; // 厂家名称
@ApiModelProperty("供应商sid")
private String supplierSid; // 供应商sid
@ApiModelProperty("供应商名称")
private String supplierName; // 供应商名称
@ApiModelProperty("销售指导价")
private BigDecimal saleGuidePrice; // 销售指导价
@ApiModelProperty("入库单价")
private BigDecimal inCost; // 入库单价
@ApiModelProperty("税率")
private String taxRate; // 税率
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("首次入库日期")
private Date firstInDateStart; // 首次入库日期
private Date firstInDateEnd; // 首次入库日期
@ApiModelProperty("商品类别sid")
private String goodsTypeSid; // 商品类别sid
@ApiModelProperty("商品类别编码")
private String goodsTypeCode; // 商品类别编码
@ApiModelProperty("商品类别名称")
private String goodsTypeName; // 商品类别名称
@ApiModelProperty("已上架数量")
private BigDecimal listNum; // 已上架数量
@ApiModelProperty("是否为一物一码(0是,1否)")
private Integer isYwym; // 是否为一物一码(0是,1否)
}

39
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailMapper.java

@ -0,0 +1,39 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.wms.biz.inventory.wmsinitialdetail;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper
public interface WmsInitialDetailMapper extends BaseMapper<WmsInitialDetail> {
IPage<WmsInitialDetailVo> selectPageVo(IPage<WmsInitialDetail> page, @Param(Constants.WRAPPER) Wrapper<WmsInitialDetail> qw);
}

9
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailMapper.xml

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.wms.biz.inventory.wmsinitialdetail.WmsInitialDetailMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.wms.biz.inventory.wmsinitialdetail.WmsInitialDetailVo">
SELECT * FROM wms_initial_detail <where> ${ew.sqlSegment} </where>
</select>
</mapper>

93
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailQuery.java

@ -0,0 +1,93 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.wms.biz.inventory.wmsinitialdetail;
import com.yxt.common.core.query.Query;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "期初上架-明细 查询条件", description = "期初上架-明细 查询条件")
public class WmsInitialDetailQuery implements Query {
@ApiModelProperty("单据sid")
private String billSid; // 单据sid
@ApiModelProperty("商品spuSid")
private String goodsSpuSid; // 商品spuSid
@ApiModelProperty("商品spu名称")
private String goodsSpuName; // 商品spu名称
@ApiModelProperty("商品skuSid")
private String goodsSkuSid; // 商品skuSid
@ApiModelProperty("商品Sku名称")
private String goodsSkuTitle; // 商品Sku名称
@ApiModelProperty("图号")
private String goodsSkuCode; // 图号
@ApiModelProperty("规格型号")
private String goodsSkuOwnSpec; // 规格型号
@ApiModelProperty("单位")
private String unit; // 单位
@ApiModelProperty("数量")
private BigDecimal num; // 数量
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
private String brandName; // 品牌名称
@ApiModelProperty("厂家sid")
private String manufacturerSid; // 厂家sid
@ApiModelProperty("厂家名称")
private String manufacturerName; // 厂家名称
@ApiModelProperty("供应商sid")
private String supplierSid; // 供应商sid
@ApiModelProperty("供应商名称")
private String supplierName; // 供应商名称
@ApiModelProperty("销售指导价")
private BigDecimal saleGuidePrice; // 销售指导价
@ApiModelProperty("入库单价")
private BigDecimal inCost; // 入库单价
@ApiModelProperty("税率")
private String taxRate; // 税率
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("首次入库日期")
private Date firstInDateStart; // 首次入库日期
private Date firstInDateEnd; // 首次入库日期
@ApiModelProperty("商品类别sid")
private String goodsTypeSid; // 商品类别sid
@ApiModelProperty("商品类别编码")
private String goodsTypeCode; // 商品类别编码
@ApiModelProperty("商品类别名称")
private String goodsTypeName; // 商品类别名称
@ApiModelProperty("已上架数量")
private BigDecimal listNum; // 已上架数量
@ApiModelProperty("是否为一物一码(0是,1否)")
private Integer isYwym; // 是否为一物一码(0是,1否)
}

47
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailService.java

@ -0,0 +1,47 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.wms.biz.inventory.wmsinitialdetail;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Service;
@Service
public class WmsInitialDetailService extends MybatisBaseService<WmsInitialDetailMapper, WmsInitialDetail> {
public PagerVo<WmsInitialDetailVo> listPageVo(PagerQuery<WmsInitialDetailQuery> pq) {
WmsInitialDetailQuery query = pq.getParams();
QueryWrapper<WmsInitialDetail> qw = new QueryWrapper<>();
IPage<WmsInitialDetail> page = PagerUtil.queryToPage(pq);
IPage<WmsInitialDetailVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<WmsInitialDetailVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
}

74
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailVo.java

@ -0,0 +1,74 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.wms.biz.inventory.wmsinitialdetail;
import com.yxt.common.core.vo.Vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "期初上架-明细 视图数据对象", description = "期初上架-明细 视图数据对象")
public class WmsInitialDetailVo implements Vo {
private String sid;
@ApiModelProperty("商品spu名称")
private String goodsSpuName;
@ApiModelProperty("图号")
private String goodsSkuCode;
@ApiModelProperty("规格型号")
private String goodsSkuOwnSpec;
@ApiModelProperty("单位")
private String unit;
@ApiModelProperty("数量")
private BigDecimal num;
@ApiModelProperty("品牌名称")
private String brandName;
@ApiModelProperty("厂家名称")
private String manufacturerName;
@ApiModelProperty("供应商名称")
private String supplierName;
@ApiModelProperty("销售指导价")
private BigDecimal saleGuidePrice;
@ApiModelProperty("入库单价")
private BigDecimal inCost;
@ApiModelProperty("税率")
private String taxRate;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("首次入库日期")
private Date firstInDate;
@ApiModelProperty("商品类别名称")
private String goodsTypeName;
@ApiModelProperty("已上架数量")
private BigDecimal listNum;
@ApiModelProperty("是否为一物一码(0是,1否)")
private Integer isYwym;
}
Loading…
Cancel
Save