admin/src/components/business/OperaTmsFactoryParamWindow.vue
@@ -15,7 +15,10 @@ <el-form-item label="总库存量（万支）" prop="num1"> <el-input v-model="form.num1" placeholder="请输入总库存量（万支）" v-trim/> </el-form-item> <el-form-item label="总出库能力（万支）" prop="num2"> <el-form-item label="8小时出库能力（万支）" prop="num2"> <el-input v-model="form.param3" placeholder="请输入8小时出库能力（万支）" v-trim/> </el-form-item> <el-form-item label="最大出库能力（万支）" prop="num2"> <el-input v-model="form.num2" placeholder="请输入总出库能力（万支）" v-trim/> </el-form-item> <el-form-item label="排序码" prop="sortnum"> @@ -41,7 +44,8 @@ name: '', sortnum: '', num1: '', num2: '' num2: '', param3: '' }, // 验证规则 rules: { admin/src/views/business/tmsFactoryParam.vue
@@ -26,10 +26,11 @@ @selection-change="handleSelectionChange" > <el-table-column type="selection" width="55"></el-table-column> <el-table-column prop="name" label="姓名" min-width="100px"></el-table-column> <el-table-column prop="name" label="名称" min-width="100px"></el-table-column> <el-table-column prop="code" label="编码" min-width="100px"></el-table-column> <el-table-column prop="num1" label="总库存量（万支）" min-width="100px"></el-table-column> <el-table-column prop="num2" label="总出库能力（万支）" min-width="100px"></el-table-column> <el-table-column prop="param3" label="8小时出库能力（万支）" min-width="100px"></el-table-column> <el-table-column prop="num2" label="最大出库能力（万支）" min-width="100px"></el-table-column> <el-table-column prop="sortnum" label="排序码" min-width="100px"></el-table-column> <el-table-column prop="editorName" label="操作人" min-width="100px"></el-table-column> <el-table-column prop="editDate" label="更新时间" min-width="100px"></el-table-column> server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@ spring: profiles: active: dev active: pro application: name: visitsAdmin # 安全配置 server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/TotalOutQtyNumVO.java
@@ -15,33 +15,17 @@ @Data public class TotalOutQtyNumVO { @ApiModelProperty(value = "本周出库量(省内)") private BigDecimal currentInWeekNum; @ApiModelProperty(value = "本周出库量(省外)") private BigDecimal currentOutWeekNum; @ApiModelProperty(value = "上周出库量（省内）") private BigDecimal lastInWeekNum; @ApiModelProperty(value = "上周出库量（省外）") private BigDecimal lastOutWeekNum; @ApiModelProperty(value = "本月出库量（省内）") private BigDecimal currentInMonthNum; @ApiModelProperty(value = "本月出库量（省外）") private BigDecimal currentOutMonthNum; @ApiModelProperty(value = "上月出库量（省内）") private BigDecimal lastInMonthNum; @ApiModelProperty(value = "上月出库量（省外）") private BigDecimal lastOutMonthNum; @ApiModelProperty(value = "去年同月出库量(省内）") private BigDecimal sameInMonthNum; @ApiModelProperty(value = "去年同月出库量（省外）") private BigDecimal sameOutMonthNum; @ApiModelProperty(value = "本年出库量(省内）") private BigDecimal currentInYearNum; @ApiModelProperty(value = "本年出库量（省外）") private BigDecimal currentOutYearNum; @ApiModelProperty(value = "去年出库量（省内）") private BigDecimal lastInYearNum; @ApiModelProperty(value = "去年出库量（省外）") private BigDecimal lastOutYearNum; @ApiModelProperty(value = "当前周期出库量(省内)") private BigDecimal currentInNum; @ApiModelProperty(value = "当前周期出库量(省外)") private BigDecimal currentOutNum; @ApiModelProperty(value = "上隔天周期出库量（省内）") private BigDecimal lastInNum; @ApiModelProperty(value = "上个周期出库量（省外）") private BigDecimal lastOutNum; @ApiModelProperty(value = "去年同期出库量(省内）") private BigDecimal sameInNum; @ApiModelProperty(value = "去年同期出库量（省外）") private BigDecimal sameOutNum; } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -2090,23 +2090,15 @@ * @return */ @Override public TotalOutQtyNumVO totalOutQtyNum(){ public TotalOutQtyNumVO totalOutQtyNum(int queryType){ TotalOutQtyNumVO data = new TotalOutQtyNumVO(); data.setCurrentInYearNum(new BigDecimal(0)); data.setCurrentInWeekNum(new BigDecimal(0)); data.setCurrentInMonthNum(new BigDecimal(0)); data.setLastInYearNum(new BigDecimal(0)); data.setLastInMonthNum(new BigDecimal(0)); data.setLastInWeekNum(new BigDecimal(0)); data.setSameInMonthNum(new BigDecimal(0)); data.setCurrentInNum(new BigDecimal(0)); data.setLastInNum(new BigDecimal(0)); data.setSameInNum(new BigDecimal(0)); //---------省外---------------- data.setCurrentOutYearNum(new BigDecimal(0)); data.setCurrentOutWeekNum(new BigDecimal(0)); data.setCurrentOutMonthNum(new BigDecimal(0)); data.setLastOutYearNum(new BigDecimal(0)); data.setLastOutMonthNum(new BigDecimal(0)); data.setLastOutWeekNum(new BigDecimal(0)); data.setSameOutMonthNum(new BigDecimal(0)); data.setCurrentOutNum(new BigDecimal(0)); data.setLastOutNum(new BigDecimal(0)); data.setSameOutNum(new BigDecimal(0)); return data; } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java
@@ -101,5 +101,5 @@ List<WholeProvinceMapVO> mapYearAndMonthOutList(); TotalOutQtyNumVO totalOutQtyNum(); TotalOutQtyNumVO totalOutQtyNum(int queryType); }
