src/main/java/zy/cloud/wms/manager/controller/QualityController.java
@@ -18,7 +18,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import zy.cloud.wms.manager.service.ReceiveDetlService; import zy.cloud.wms.manager.utils.AddZero; import java.text.DecimalFormat; import java.text.SimpleDateFormat; import java.util.*; @@ -91,8 +93,20 @@ @RequestMapping("/quality/orderNo/init1") @ManagerAuth(memo = "生成单据编号") public R initOrderNo() { SimpleDateFormat dateformat = new SimpleDateFormat("yyyyMMddHHmmss"); String orderNo = " QC-" + String.valueOf(dateformat.format(new Date())); String billNo = "QC-" + new SimpleDateFormat("yyyyMMdd").format(new Date())+"-"; String currNum = qualityService.getCurrNum(billNo); String orderNo=null; if (!Cools.isEmpty(currNum)) { String[] split = currNum.split("-"); if (split.length < 2){ orderNo= billNo + "0001"; } Integer newNum = Integer.parseInt(split[2]) +1; String format = AddZero.addZeroForNum(newNum + "", 4); orderNo = billNo + format; }else { orderNo = billNo + "0001"; } return R.ok().add(orderNo); }
@@ -16,6 +16,7 @@ import zy.cloud.wms.manager.entity.param.*; import zy.cloud.wms.manager.entity.result.KeyValueVo; import zy.cloud.wms.manager.service.*; import zy.cloud.wms.manager.utils.AddZero; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -40,6 +41,8 @@ @Autowired private OrderService orderService; @Autowired private ReceiveService receiveService; @RequestMapping("/stock/pakin") @ManagerAuth(memo = "入库") public R stockPakin(@RequestBody PakinParam number) { @@ -144,12 +147,19 @@ @RequestMapping("/orderNo/init") @ManagerAuth(memo = "生成单据编号") public R initOrderNo() { long nextId = snowflakeIdWorker.nextId(); SimpleDateFormat dateformat = new SimpleDateFormat("yyyyMMddHHmmss"); String orderNo = "AT-" + String.valueOf(dateformat.format(new Date())); //String orderNo = "AT-" + String.valueOf(nextId).substring(0, 15); if (orderService.selectByOrderNo(orderNo, getHostId()) != null) { return R.error("抱歉，单据编号已存在"); String billNo = "QC-" + new SimpleDateFormat("yyyyMMdd").format(new Date())+"-"; String currNum = receiveService.getCurrNum(billNo); String orderNo=null; if (!Cools.isEmpty(currNum)) { String[] split = currNum.split("-"); if (split.length < 2){ orderNo= billNo + "0001"; } Integer newNum = Integer.parseInt(split[2]) +1; String format = AddZero.addZeroForNum(newNum + "", 4); orderNo = billNo + format; }else { orderNo = billNo + "0001"; } return R.ok().add(orderNo); } src/main/java/zy/cloud/wms/manager/mapper/QualityMapper.java
@@ -1,5 +1,6 @@ package zy.cloud.wms.manager.mapper; import org.apache.ibatis.annotations.Param; import zy.cloud.wms.manager.entity.Quality; import com.baomidou.mybatisplus.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -8,5 +9,5 @@ @Mapper @Repository public interface QualityMapper extends BaseMapper<Quality> { String getCurrNum(@Param("billNo") String billNo); } src/main/java/zy/cloud/wms/manager/mapper/ReceiveMapper.java
@@ -19,4 +19,5 @@ Integer getPageCount(Map<String, Object> map); String getCurrNum(@Param("orderNo") String orderNo); } src/main/java/zy/cloud/wms/manager/service/QualityService.java
@@ -4,5 +4,5 @@ import com.baomidou.mybatisplus.service.IService; public interface QualityService extends IService<Quality> { String getCurrNum(String billNo); } src/main/java/zy/cloud/wms/manager/service/ReceiveService.java
@@ -20,4 +20,6 @@ Page<Receive> getPage(Page<Receive> page); String getCurrNum(String orderNo); } src/main/java/zy/cloud/wms/manager/service/impl/QualityServiceImpl.java
@@ -8,5 +8,8 @@ @Service("qualityService") public class QualityServiceImpl extends ServiceImpl<QualityMapper, Quality> implements QualityService { @Override public String getCurrNum(String billNo) { return this.baseMapper.getCurrNum(billNo); } } src/main/java/zy/cloud/wms/manager/service/impl/ReceiveServiceImpl.java
@@ -51,5 +51,8 @@ page.setTotal(baseMapper.getPageCount(page.getCondition())); return page; } @Override public String getCurrNum(String orderNo) { return this.baseMapper.getCurrNum(orderNo); } } src/main/resources/mapper/QualityMapper.xml
@@ -16,5 +16,7 @@ <result column="create_time" property="createTime" /> </resultMap> <select id="getCurrNum" resultType="java.lang.String"> SELECT top 1 bill_no FROM man_quality WHERE 1=1 AND bill_no like concat(#{billNo},'%') ORDER BY bill_no DESC </select> </mapper> src/main/resources/mapper/ReceiveMapper.xml
@@ -101,5 +101,8 @@ </if> </sql> <select id="getCurrNum" resultType="java.lang.String"> SELECT top 1 order_no FROM man_receive WHERE 1=1 AND order_no like concat(#{orderNo},'%') ORDER BY order_no DESC </select> </mapper> src/main/webapp/static/js/quality/quality.js
@@ -78,6 +78,7 @@ switch(obj.event) { case 'addData': showEditModel(); initOrderNo1(); break; case 'deleteData': if (checkStatus.length === 0) { src/main/webapp/static/js/receive/matRecQuery.js
@@ -76,6 +76,7 @@ }); } } initOrderNo(); var index = layer.load(1, {shade: [0.1,'#000']}); // 单据类型 var docTypeData; src/main/webapp/views/quality/quality.html
@@ -33,7 +33,7 @@ </div> <script type="text/html" id="toolbar"> <div class="layui-btn-container"> <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button> <button class="layui-btn layui-btn-sm" id="btn-add" layui-anim-down lay-event="addData">新增</button> <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">删除</button> <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">导出</button> </div> @@ -74,7 +74,7 @@ <div class="layui-form-item"> <label class="layui-form-label">检验单号: </label> <div class="layui-input-block"> <input class="layui-input" name="billNo" id="billNo" placeholder="请输入检验单号" lay-verify="required"> <input class="layui-input layui-disabled" readonly name="billNo" id="billNo" placeholder="请输入检验单号" lay-verify="required"> </div> </div> <div class="layui-form-item"> @@ -134,7 +134,7 @@ </div> <hr class="layui-bg-gray"> <div class="layui-form-item text-right"> <button class="layui-btn layui-btn-primary" id="autoNo" onclick="initOrderNo1()">编号自动生成</button> <!-- <button class="layui-btn layui-btn-primary" id="autoNo" onclick="initOrderNo1()">编号自动生成</button>--> <button class="layui-btn" lay-filter="editSubmit" lay-submit="">保存</button> <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button> </div> src/main/webapp/views/receive/matQuery.html
@@ -162,7 +162,7 @@ <div class="layui-form-item"> <label class="layui-form-label layui-form-required">单据编号:</label> <div class="layui-input-block"> <input id="orderNo" name="orderNo" placeholder="请输入单据编号" class="layui-input" lay-verType="tips" lay-verify="required" autocomplete="off"> <input id="orderNo" name="orderNo" placeholder="请输入单据编号" readonly class="layui-input layui-disabled" lay-verType="tips" lay-verify="required" autocomplete="off"> </div> </div> <div class="layui-form-item"> @@ -186,7 +186,7 @@ </div> </div> <div class="layui-form-item cool-button-contain"> <button class="layui-btn layui-btn-primary" id="autoNo" onclick="initOrderNo()">编号自动生成</button> <!-- <button class="layui-btn layui-btn-primary" id="autoNo" onclick="initOrderNo()">编号自动生成</button>--> <button class="layui-btn layui-btn-normal" id="confirm" lay-filter="confirm" lay-submit="">确定</button> </div> </div>
