From acdcaee563c5cb53729acfc33bd9ddbcbf53f8a9 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 23 三月 2022 16:49:53 +0800
Subject: [PATCH] #杰克缝纫机立库 【优化单据管理】
---
src/main/java/com/zy/asrs/controller/MatCodeController.java | 110 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 84 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index eea80d8..5c3823d 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -14,13 +14,19 @@
import com.core.common.R;
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.entity.MatCodePrint;
+import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.service.MatCodeService;
+import com.zy.asrs.utils.VersionUtils;
import com.zy.common.CodeRes;
+import com.zy.common.config.AdminInterceptor;
+import com.zy.common.model.KeyValueVo;
import com.zy.common.utils.BarcodeUtils;
+import com.zy.common.utils.QrCode;
import com.zy.common.utils.excel.matcode.MatCodeExcel;
import com.zy.common.utils.excel.matcode.MatCodeExcelListener;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -37,9 +43,49 @@
@Autowired
private MatCodeService matCodeService;
+ /*************************************** xm-select ***********************************************/
+
+ // xm-select 鎼滅储鍟嗗搧鍒楄〃
+ @RequestMapping("/mat/all/get/kv")
+ @ManagerAuth
+ public R getMatDataKV(@RequestParam(required = false) String condition) {
+ Wrapper<MatCode> wrapper = new EntityWrapper<MatCode>()
+ .andNew().like("mat_no", condition).or().like("mat_name", condition)
+ .orderBy("appe_time", false);
+ List<MatCode> mats = matCodeService.selectPage(new Page<>(1, 30), wrapper).getRecords();
+ List<KeyValueVo> valueVos = new ArrayList<>();
+ for (MatCode mat : mats) {
+ KeyValueVo vo = new KeyValueVo();
+ vo.setName(mat.getMatNo() + " - " + mat.getMatName());
+ vo.setValue(mat.getMatNo());
+ valueVos.add(vo);
+ }
+ return R.ok().add(valueVos);
+ }
+
+ @RequestMapping(value = "/matCode/covert/{id}/auth")
+ @ManagerAuth
+ public R covert(@PathVariable("id") String id) {
+ MatCode matCode = matCodeService.selectById(String.valueOf(id));
+ if (matCode == null) {
+ return R.ok();
+ }
+ OrderDetl orderDetl = new OrderDetl();
+ VersionUtils.setOrderDetl(orderDetl, matCode);
+ orderDetl.setAnfme(0.0D);
+ return R.ok().add(orderDetl);
+ }
+
+
@RequestMapping(value = "/matCode/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
+ return R.ok(matCodeService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/matCode/auth")
+ @ManagerAuth
+ public R find(@RequestParam("id") String id) {
return R.ok(matCodeService.selectById(String.valueOf(id)));
}
@@ -49,22 +95,28 @@
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
excludeTrash(param);
EntityWrapper<MatCode> wrapper = new EntityWrapper<>();
convert(param, wrapper);
+ allLike(MatCode.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ else {
+ wrapper.orderBy("modi_time", false);
+ }
return R.ok(matCodeService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
- if (entry.getKey().endsWith(">")) {
- wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
- } else if (entry.getKey().endsWith("<")) {
- wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- wrapper.eq(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(entry.getKey(), val);
}
}
}
@@ -107,19 +159,14 @@
// 瀵煎嚭
@RequestMapping(value = "/matCode/export/auth")
- @ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "鐗╂枡缂栫爜鏁版嵁瀵煎嚭")
+ @ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "鍟嗗搧缂栧彿鏁版嵁瀵煎嚭")
public void export(@RequestParam(required = false) String fileName,
@RequestParam(required = false) Integer rowCount,
HttpServletResponse response) throws Exception {
List<MatCode> list = matCodeService.selectList(new EntityWrapper<>());
List<MatCodeExcel> excels = new ArrayList<>();
for (MatCode matCode : list) {
- MatCodeExcel excel = new MatCodeExcel();
- excel.setMatNo(matCode.getMatNo());
- excel.setBarcode(matCode.getBarcode());
- excel.setMatName(matCode.getMatName());
- excel.setStr1(matCode.getStr1());
- excel.setStr2(matCode.getStr2());
+ MatCodeExcel excel = VersionUtils.getExcel(matCode);
excels.add(excel);
if (rowCount != null && excels.size() >= rowCount){
break;
@@ -127,7 +174,7 @@
}
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf-8");
- fileName = URLEncoder.encode(Cools.isEmpty(fileName)?"鐗╂枡缂栫爜":fileName, "UTF-8");
+ fileName = URLEncoder.encode(Cools.isEmpty(fileName)?"鍟嗗搧缂栧彿":fileName, "UTF-8");
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
EasyExcel.write(response.getOutputStream(), MatCodeExcel.class)
.registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
@@ -137,16 +184,17 @@
// 瀵煎叆
@RequestMapping(value = "/matCode/import/auth")
- @ManagerAuth(memo = "鐗╂枡缂栫爜鏁版嵁瀵煎叆")
+ @ManagerAuth(memo = "鍟嗗搧缂栧彿鏁版嵁瀵煎叆")
+ @Transactional
public R matCodeImport(MultipartFile file) throws IOException, InterruptedException {
- Thread.sleep(2000);
- EasyExcel.read(file.getInputStream(), MatCodeExcel.class, new MatCodeExcelListener()).sheet().doRead();
- return R.ok();
+ MatCodeExcelListener listener = new MatCodeExcelListener(getUserId());
+ EasyExcel.read(file.getInputStream(), MatCodeExcel.class, listener).sheet().doRead();
+ return R.ok("鎴愬姛瀵煎叆"+listener.getTotal()+"鏉＄墿鏂欎俊鎭�");
}
// 鎵撳嵃
- @RequestMapping(value = "/macCode/print/auth")
- @ManagerAuth(memo = "鐗╂枡缂栫爜鎵撳嵃")
+ @RequestMapping(value = "/matCode/print/auth")
+ @ManagerAuth(memo = "鍟嗗搧缂栧彿鎵撳嵃")
public R matCodePrint(@RequestParam(value = "param[]") String[] param) {
if(Cools.isEmpty(param)) {
return R.parse(CodeRes.EMPTY);
@@ -157,7 +205,7 @@
// 鎵撳嵃鏁版嵁娉ㄥ叆
MatCodePrint print = new MatCodePrint();
print.setMatNo(matCode.getMatNo());
- print.setBarcodeUrl(matCode.getBarcode());
+ print.setBarcode(matCode.getBarcode());
print.setMatName(matCode.getMatName());
print.setStr1(matCode.getStr1());
print.setStr2(matCode.getStr2());
@@ -166,11 +214,21 @@
return R.ok().add(res);
}
- // todo resource
- @RequestMapping(value = "/macCode/barcode/auth")
- @ManagerAuth(memo = "鐗╂枡缂栫爜鏉″舰鐮佽幏鍙�")
- public R matCodeBarcode(@RequestParam String param, HttpServletResponse response) throws IOException {
- BufferedImage img = BarcodeUtils.encode(param);
+ @RequestMapping(value = "/macCode/code/auth")
+// @ManagerAuth(memo = "鍟嗗搧缂栧彿鏉″舰鐮佽幏鍙�(type:1(鏉″舰鐮�);2(浜岀淮鐮�)")
+ public R matCodeBarcode(@RequestParam(defaultValue = "1") Integer type
+ , @RequestParam String param
+ , HttpServletResponse response) throws Exception {
+ AdminInterceptor.cors(response);
+ if (Cools.isEmpty(param)){
+ return R.parse(BaseRes.EMPTY);
+ }
+ BufferedImage img;
+ if (type == 1) {
+ img = BarcodeUtils.encode(param);
+ } else {
+ img = QrCode.createImg(param);
+ }
if (!ImageIO.write(img, "jpg", response.getOutputStream())) {
throw new IOException("Could not write an image of format jpg");
}
--
Gitblit v1.9.1