diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fintemptimepush/FinTempTimePush.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fintemptimepush/FinTempTimePush.java new file mode 100644 index 0000000000..492a3cee1e --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fintemptimepush/FinTempTimePush.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.fin.api.fintemptimepush; + +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; + + +@ApiModel(value = "金蝶数据推送-临时表", description = "金蝶数据推送-临时表") +@TableName("fin_temp_time_push") +@Data +public class FinTempTimePush extends BaseEntity { + private static final long serialVersionUID = 1L; + + + @ApiModelProperty("业务sid") + private String busSid; + @ApiModelProperty("业务类型") + private String busType; + + + + +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fintemptimepush/FinTempTimePushDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fintemptimepush/FinTempTimePushDto.java new file mode 100644 index 0000000000..bd5a246876 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fintemptimepush/FinTempTimePushDto.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.fin.api.fintemptimepush; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class FinTempTimePushDto implements Dto { + + private String createBySid; + @ApiModelProperty("业务sid") + private String busSid; + @ApiModelProperty("业务类型") + private String busType; + + +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fintemptimepush/FinTempTimePushFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fintemptimepush/FinTempTimePushFeign.java new file mode 100644 index 0000000000..1770b28628 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fintemptimepush/FinTempTimePushFeign.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.fin.api.fintemptimepush; + +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@Api(tags = "金蝶数据推送-临时表") +@FeignClient( + contextId = "anrui-fin-FinTempTimePush", + name = "anrui-fin", + path = "v1/FinTempTimePush") +public interface FinTempTimePushFeign { + + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody FinTempTimePushDto dto); + + + +} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushMapper.java new file mode 100644 index 0000000000..8e3d756085 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushMapper.java @@ -0,0 +1,40 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.biz.fintemptimepush; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.anrui.fin.api.fintemptimepush.FinTempTimePush; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface FinTempTimePushMapper extends BaseMapper { + + + List selListByBusType(@Param("busType") String busType); +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushMapper.xml new file mode 100644 index 0000000000..7a5bd7acdf --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushRest.java new file mode 100644 index 0000000000..679b5ac352 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushRest.java @@ -0,0 +1,48 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.biz.fintemptimepush; + +import com.yxt.anrui.fin.api.fintemptimepush.FinTempTimePushDto; +import com.yxt.anrui.fin.api.fintemptimepush.FinTempTimePushFeign; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +@Api(tags = "金蝶数据推送-临时表") +@RestController("com.yxt.anrui.fin.biz.fintemptimepush.FinTempTimePushRest") +@RequestMapping("v1/FinTempTimePush") +public class FinTempTimePushRest implements FinTempTimePushFeign { + + @Autowired + private FinTempTimePushService finTempTimePushService; + @Override + public ResultBean save(FinTempTimePushDto dto) { + return finTempTimePushService.saveEntity(dto); + } +} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushService.java new file mode 100644 index 0000000000..94d7a0864d --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/FinTempTimePushService.java @@ -0,0 +1,52 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.biz.fintemptimepush; + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.fin.api.fintemptimepush.FinTempTimePush; +import com.yxt.anrui.fin.api.fintemptimepush.FinTempTimePushDto; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.result.ResultBean; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class FinTempTimePushService extends MybatisBaseService { + + + public ResultBean saveEntity(FinTempTimePushDto dto) { + ResultBean rb = ResultBean.fireFail(); + FinTempTimePush finTempTimePush = new FinTempTimePush(); + BeanUtil.copyProperties(dto,finTempTimePush); + baseMapper.insert(finTempTimePush); + return rb.success(); + } + + public List selListByBusType(String busType) { + return baseMapper.selListByBusType(busType); + } +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/TimingPushService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/TimingPushService.java new file mode 100644 index 0000000000..6138bd6794 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fintemptimepush/TimingPushService.java @@ -0,0 +1,40 @@ +package com.yxt.anrui.fin.biz.fintemptimepush; + +import com.yxt.anrui.fin.api.fintemptimepush.FinTempTimePush; +import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.LoanMonthlyAccrualApplyFeign; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.util.Collections; +import java.util.List; + +/** + * @author Administrator + * @description + * @date 2023/11/7 14:02 + */ +@Component +public class TimingPushService { + + @Autowired + private LoanMonthlyAccrualApplyFeign loanMonthlyAccrualApplyFeign; + @Autowired + private FinTempTimePushService finTempTimePushService; + + /** + * 定时推送月还计提凭证 + */ + @Scheduled(cron = "0 0 3 2,3,4,5,6,7,8,9,10 * ? ") //每月2-10号 3点推送 + public void monthlyAccrualVoucher() { + List list = finTempTimePushService.selListByBusType("月还计提"); + list.removeAll(Collections.singleton(null)); + if (!list.isEmpty()) { + for (FinTempTimePush f : list) { + loanMonthlyAccrualApplyFeign.rePushVoucher(f.getBusSid()); + finTempTimePushService.deleteBySid(f.getSid()); + } + } + + } +} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java index f459056e4f..9a31bfa3a9 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java @@ -1187,9 +1187,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { newVoucher.setAccountBook(voucher.getUseOrgCode()); newVoucher.setVoucherNo(voucher.getUseOrgCode()); } - Date date = new Date(); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - String formatDate = sdf.format(date); + String formatDate = voucher.getBussDate(); String[] split = formatDate.split("-"); String month = split[1]; int m = Integer.parseInt(month); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java index 5dd680f3a4..12988098c9 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java @@ -15,6 +15,8 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; +import com.yxt.anrui.fin.api.fintemptimepush.FinTempTimePushDto; +import com.yxt.anrui.fin.api.fintemptimepush.FinTempTimePushFeign; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher; import com.yxt.anrui.flowable.api.flow.FlowableFeign; @@ -124,6 +126,8 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService accrualInit(String orgPath) { ResultBean rb = ResultBean.fireFail(); @@ -636,21 +640,27 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService(1024), namedThreadFactory, new org.apache.tomcat.util.threads.ThreadPoolExecutor.AbortPolicy()); - //推送月还计提凭证数据 - Future future = pool.submit(() -> { - pushAccrualVoucher(businessSid); - }); - } catch (Exception e) { - e.printStackTrace(); - log.error("推送数据失败=========================" + e.getMessage()); - return rb.setMsg("推送数据失败"); - } + //推送金蝶保存数据临时表 + FinTempTimePushDto finTempTimePushDto = new FinTempTimePushDto(); + finTempTimePushDto.setCreateBySid(accrualApply.getCreateBySid()); + finTempTimePushDto.setBusSid(businessSid); + finTempTimePushDto.setBusType("月还计提"); + finTempTimePushFeign.save(finTempTimePushDto); +// try { +// ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() +// .setNameFormat("demo-pool-%d").build(); +// ExecutorService pool = new org.apache.tomcat.util.threads.ThreadPoolExecutor(1, 10, +// 1000, TimeUnit.MILLISECONDS, +// new LinkedBlockingQueue(1024), namedThreadFactory, new org.apache.tomcat.util.threads.ThreadPoolExecutor.AbortPolicy()); +// //推送月还计提凭证数据 +// Future future = pool.submit(() -> { +// pushAccrualVoucher(businessSid); +// }); +// } catch (Exception e) { +// e.printStackTrace(); +// log.error("推送数据失败=========================" + e.getMessage()); +// return rb.setMsg("推送数据失败"); +// } } return rb.success().setData(resultBean.getData()); } else { @@ -659,6 +669,7 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService records = loanMonthlyAccrualRecordService.selByMainSid(businessSid); if (!records.isEmpty()) { int index = 1000; @@ -669,6 +680,7 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService newList = records.subList(i, i + index); if (!newList.isEmpty()) { GeneralVoucher generalVoucher = new GeneralVoucher(); + generalVoucher.setBussDate(DateUtil.formatDate(apply.getClosingDate())); List voucherDetails = new ArrayList<>(); for (LoanMonthlyAccrualRecord v : newList) { LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.fetchDetails(v.getRecordSid()).getData(); diff --git a/yxt-as-ui/src/views/storage/adjustment/adjustmentAdd.vue b/yxt-as-ui/src/views/storage/adjustment/adjustmentAdd.vue index e148fcbcab..ab05072739 100644 --- a/yxt-as-ui/src/views/storage/adjustment/adjustmentAdd.vue +++ b/yxt-as-ui/src/views/storage/adjustment/adjustmentAdd.vue @@ -3,7 +3,7 @@
-
{{title}}定调价策略申请
+
{{ title }}定调价策略申请
保存 @@ -13,15 +13,9 @@
-
- - -
申请人
{{ formobj.createByName }} @@ -35,351 +29,287 @@ {{ formobj.createTime }} -
备注
- + + + -
商品类别列表
添加
- - + - - + + - - -
- - + - +
diff --git a/yxt-as-ui/src/views/storage/adjustment/adjustmentInfo.vue b/yxt-as-ui/src/views/storage/adjustment/adjustmentInfo.vue index 07fbc44941..a1baea1d18 100644 --- a/yxt-as-ui/src/views/storage/adjustment/adjustmentInfo.vue +++ b/yxt-as-ui/src/views/storage/adjustment/adjustmentInfo.vue @@ -1,6 +1,5 @@ diff --git a/yxt-as-ui/src/views/storage/adjustment/index.vue b/yxt-as-ui/src/views/storage/adjustment/index.vue index a5a31a64b5..9cfcaae488 100644 --- a/yxt-as-ui/src/views/storage/adjustment/index.vue +++ b/yxt-as-ui/src/views/storage/adjustment/index.vue @@ -2,7 +2,7 @@
- +
@@ -10,30 +10,26 @@
- + - + - + - + - + 至 - + - + 至 - +
@@ -49,14 +45,12 @@
- - - + + + @@ -66,7 +60,6 @@ {{ scope.row.nodeState }} - @@ -76,289 +69,288 @@
-
+
- +
- + - + - +
diff --git a/yxt-as-ui/src/views/storage/inventory/inventoryRefer.vue b/yxt-as-ui/src/views/storage/inventory/inventoryRefer.vue index bc997fea9e..49452f10fa 100644 --- a/yxt-as-ui/src/views/storage/inventory/inventoryRefer.vue +++ b/yxt-as-ui/src/views/storage/inventory/inventoryRefer.vue @@ -2,7 +2,7 @@
- +
@@ -10,44 +10,48 @@
- + - + - + - + - + - + - + - + + + + - + + + + - + 至 - + - + - +
@@ -59,13 +63,12 @@
商品出入库列表
- +
- + @@ -87,7 +90,7 @@ - + @@ -95,10 +98,9 @@
-
+
- +
@@ -107,190 +109,210 @@ diff --git a/yxt-as-ui/src/views/workFlow/adjustmentFlow/adjustmentDaiBan.vue b/yxt-as-ui/src/views/workFlow/adjustmentFlow/adjustmentDaiBan.vue index 834580093c..68746a8e0d 100644 --- a/yxt-as-ui/src/views/workFlow/adjustmentFlow/adjustmentDaiBan.vue +++ b/yxt-as-ui/src/views/workFlow/adjustmentFlow/adjustmentDaiBan.vue @@ -34,17 +34,17 @@
商品类别列表
- - - + + + @@ -82,8 +82,10 @@ 意见: - + + +
@@ -96,372 +98,366 @@ diff --git a/yxt-as-ui/src/views/workFlow/adjustmentFlow/adjustmentEdit.vue b/yxt-as-ui/src/views/workFlow/adjustmentFlow/adjustmentEdit.vue index 453e174a19..a13d1779cf 100644 --- a/yxt-as-ui/src/views/workFlow/adjustmentFlow/adjustmentEdit.vue +++ b/yxt-as-ui/src/views/workFlow/adjustmentFlow/adjustmentEdit.vue @@ -23,310 +23,267 @@
申请日期
{{ formobj.createTime }} -
备注
- - + + + + + +
商品类别列表
- + - - + + -
- - + - - +
diff --git a/yxt-as-ui/src/views/workFlow/adjustmentFlow/adjustmentYiBan.vue b/yxt-as-ui/src/views/workFlow/adjustmentFlow/adjustmentYiBan.vue index 3d6ea3efc1..72ebad381f 100644 --- a/yxt-as-ui/src/views/workFlow/adjustmentFlow/adjustmentYiBan.vue +++ b/yxt-as-ui/src/views/workFlow/adjustmentFlow/adjustmentYiBan.vue @@ -31,17 +31,17 @@
商品类别列表
- - - + + + @@ -53,171 +53,165 @@ diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java index 479d99d7a2..7c4f3e98a9 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java @@ -14,8 +14,6 @@ import com.yxt.anrui.as.api.asbusrepairinventorybill.*; import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail; import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailSDto; import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.SitemsVo; -import com.yxt.anrui.as.api.asbusreservebill.AsBusreserveBillVo; -import com.yxt.anrui.as.api.enums.AsBillTypeEnum; import com.yxt.anrui.as.api.utils.AsRule; import com.yxt.anrui.as.api.utils.domain.AsBillNo; import com.yxt.anrui.as.biz.asbusrepairbill.AsBusrepairBillService; @@ -40,7 +38,6 @@ import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import javassist.Loader; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -263,6 +260,19 @@ public class AsBusrepairInventorybillService extends MybatisBaseService> pageList(@RequestBody PagerQuery pagerQuery){ ResultBean> rb = ResultBean.fireFail(); + WmsInventoryRecordsQuery params = pagerQuery.getParams(); + params.setType("配件库"); + pagerQuery.setParams(params); PagerVo pv = wmsInventoryRecordService.listPage(pagerQuery); return rb.success().setData(pv); } @@ -166,6 +169,7 @@ public class WmsInventoryRecordRest { @PostMapping("/exportExcel") @ApiOperation(value = "出入库记录导出") public void exportExcel(@RequestBody WmsInventoryRecordsQuery query) { + query.setType("配件库"); //得到所有要导出的数据 List exportVoList = wmsInventoryRecordService.listExcel(query); //定义导出的excel名字 diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecord.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecord.java index c1711ec0fe..c16a827931 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecord.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecord.java @@ -118,4 +118,8 @@ public class WmsInventoryRecord extends BaseEntity { private String preBillSid; @ApiModelProperty("前一单编号") private String preBillNo; + @ApiModelProperty("客户sid") + private String customerSid; + @ApiModelProperty("客户名称") + private String customerName; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordDto.java index 69c64b6548..26e3bf5156 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordDto.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordDto.java @@ -27,13 +27,10 @@ package com.yxt.wms.biz.inventory.wmsinventoryrecord; import com.yxt.common.core.dto.Dto; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; - /** * Project: wms(yxt)
* File: WmsInventoryRecordDto.java
@@ -128,4 +125,8 @@ public class WmsInventoryRecordDto implements Dto { private String preBillSid; @ApiModelProperty("前一单编号") private String preBillNo; + @ApiModelProperty("客户sid") + private String customerSid; + @ApiModelProperty("客户名称") + private String customerName; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java index 75a9fca3dc..d77136cde0 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java @@ -28,28 +28,24 @@ package com.yxt.wms.biz.inventory.wmsinventoryrecord; import cn.hutool.core.bean.BeanUtil; 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.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; import com.yxt.wms.biz.inventory.wmsinventory.WmsInventory; import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryService; -import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryVo; import com.yxt.wms.biz.inventory.wmsinventoryrecord.report.*; import com.yxt.wms.biz.inventory.wmsoldinventory.WmsOldInventoryDetailsListVo; import com.yxt.wms.feign.portal.privilege.PrivilegeQuery; import com.yxt.wms.feign.portal.sysuser.SysUserFeign; -import com.yxt.wms.feign.portal.sysuser.SysUserVo; import org.apache.commons.lang3.StringUtils; -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.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Collections; import java.util.Date; @@ -318,9 +314,7 @@ public class WmsInventoryRecordService extends MybatisBaseService page = PagerUtil.queryToPage(pagerQuery); IPage pagging = baseMapper.listPage(page, qw); @@ -415,9 +409,7 @@ public class WmsInventoryRecordService extends MybatisBaseService list = baseMapper.listExcel(qw); list.removeAll(Collections.singleton(null)); diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java index 572ff86fe1..bc4b08edb2 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java @@ -795,8 +795,9 @@ public class WmsShelfBillService extends MybatisBaseService