From e75cbe96a8bfcf5535ec8cc6adb4ad51cd034760 Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期六, 26 十月 2024 13:54:20 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/OrderGiftServiceImpl.java | 40 src/main/java/orderGift.sql | 18 src/main/webapp/views/orderGift/outGift.html | 314 ++++ src/main/java/com/zy/asrs/service/impl/OrderDetlGiftServiceImpl.java | 23 src/main/java/com/zy/asrs/controller/OrderDetlGiftController.java | 125 + src/main/java/com/zy/asrs/mapper/OrderGiftMapper.java | 12 src/main/java/orderDetlGift.sql | 18 src/main/java/com/zy/common/CodeBuilder.java | 4 src/main/java/com/zy/asrs/mapper/OrderDetlGiftMapper.java | 15 src/main/webapp/static/js/orderGift/outGift.js | 390 +++++ src/main/webapp/views/orderDetlGift/orderDetlGift.html | 225 +++ src/main/java/com/zy/asrs/service/OrderDetlGiftService.java | 12 src/main/resources/mapper/OrderGiftMapper.xml | 45 src/main/java/com/zy/asrs/service/OrderGiftService.java | 10 src/main/webapp/static/js/orderGift/orderGift.js | 871 ++++++++++++ src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java | 3 src/main/java/com/zy/asrs/controller/OrderGiftController.java | 420 +++++ src/main/java/com/zy/asrs/entity/OrderDetlGift.java | 488 ++++++ src/main/resources/mapper/OrderDetlGiftMapper.xml | 68 src/main/webapp/views/orderGift/orderGift.html | 382 +++++ src/main/java/com/zy/asrs/entity/OrderGift.java | 447 ++++++ src/main/resources/application.yml | 2 src/main/webapp/static/js/orderDetlGift/orderDetlGift.js | 297 ++++ 23 files changed, 4,226 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlGiftController.java b/src/main/java/com/zy/asrs/controller/OrderDetlGiftController.java new file mode 100644 index 0000000..e51883e --- /dev/null +++ b/src/main/java/com/zy/asrs/controller/OrderDetlGiftController.java @@ -0,0 +1,125 @@ +package com.zy.asrs.controller; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.mapper.Wrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.core.common.DateUtils; +import com.zy.asrs.entity.OrderDetlGift; +import com.zy.asrs.service.OrderDetlGiftService; +import com.core.annotations.ManagerAuth; +import com.core.common.BaseRes; +import com.core.common.Cools; +import com.core.common.R; +import com.zy.common.web.BaseController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.*; + +@RestController +public class OrderDetlGiftController extends BaseController { + + @Autowired + private OrderDetlGiftService orderDetlGiftService; + + @RequestMapping(value = "/orderDetlGift/{id}/auth") + @ManagerAuth + public R get(@PathVariable("id") String id) { + return R.ok(orderDetlGiftService.selectById(String.valueOf(id))); + } + + @RequestMapping(value = "/orderDetlGift/list/auth") + @ManagerAuth + public R list(@RequestParam(defaultValue = "1")Integer curr, + @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){ + EntityWrapper<OrderDetlGift> wrapper = new EntityWrapper<>(); + excludeTrash(param); + convert(param, wrapper); + allLike(OrderDetlGift.class, param.keySet(), wrapper, condition); + if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} + return R.ok(orderDetlGiftService.selectPage(new Page<>(curr, limit), wrapper)); + } + + private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){ + for (Map.Entry<String, Object> entry : map.entrySet()){ + 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.like(entry.getKey(), val); + } + } + } + + @RequestMapping(value = "/orderDetlGift/add/auth") + @ManagerAuth + public R add(OrderDetlGift orderDetlGift) { + orderDetlGiftService.insert(orderDetlGift); + return R.ok(); + } + + @RequestMapping(value = "/orderDetlGift/update/auth") + @ManagerAuth + public R update(OrderDetlGift orderDetlGift){ + if (Cools.isEmpty(orderDetlGift) || null==orderDetlGift.getId()){ + return R.error(); + } + orderDetlGiftService.updateById(orderDetlGift); + return R.ok(); + } + + @RequestMapping(value = "/orderDetlGift/delete/auth") + @ManagerAuth + public R delete(@RequestParam(value="ids[]") Long[] ids){ + for (Long id : ids){ + orderDetlGiftService.deleteById(id); + } + return R.ok(); + } + + @RequestMapping(value = "/orderDetlGift/export/auth") + @ManagerAuth + public R export(@RequestBody JSONObject param){ + EntityWrapper<OrderDetlGift> wrapper = new EntityWrapper<>(); + List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); + Map<String, Object> map = excludeTrash(param.getJSONObject("orderDetlGift")); + convert(map, wrapper); + List<OrderDetlGift> list = orderDetlGiftService.selectList(wrapper); + return R.ok(exportSupport(list, fields)); + } + + @RequestMapping(value = "/orderDetlGiftQuery/auth") + @ManagerAuth + public R query(String condition) { + EntityWrapper<OrderDetlGift> wrapper = new EntityWrapper<>(); + wrapper.like("id", condition); + Page<OrderDetlGift> page = orderDetlGiftService.selectPage(new Page<>(0, 10), wrapper); + List<Map<String, Object>> result = new ArrayList<>(); + for (OrderDetlGift orderDetlGift : page.getRecords()){ + Map<String, Object> map = new HashMap<>(); + map.put("id", orderDetlGift.getId()); + map.put("value", orderDetlGift.getId()); + result.add(map); + } + return R.ok(result); + } + + @RequestMapping(value = "/orderDetlGift/check/column/auth") + @ManagerAuth + public R query(@RequestBody JSONObject param) { + Wrapper<OrderDetlGift> wrapper = new EntityWrapper<OrderDetlGift>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val")); + if (null != orderDetlGiftService.selectOne(wrapper)){ + return R.parse(BaseRes.REPEAT).add(getComment(OrderDetlGift.class, String.valueOf(param.get("key")))); + } + return R.ok(); + } + +} diff --git a/src/main/java/com/zy/asrs/controller/OrderGiftController.java b/src/main/java/com/zy/asrs/controller/OrderGiftController.java new file mode 100644 index 0000000..37dfa08 --- /dev/null +++ b/src/main/java/com/zy/asrs/controller/OrderGiftController.java @@ -0,0 +1,420 @@ +package com.zy.asrs.controller; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.mapper.Wrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.core.common.*; +import com.core.exception.CoolException; +import com.zy.asrs.entity.*; +import com.zy.asrs.entity.param.OrderDomainParam; +import com.zy.asrs.entity.result.WrkTraceVo; +import com.zy.asrs.service.*; +import com.core.annotations.ManagerAuth; +import com.zy.asrs.utils.FileSaveExampleUtil; +import com.zy.common.model.DetlDto; +import com.zy.common.web.BaseController; +import org.springframework.beans.BeanUtils; +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; + +import java.util.*; + +@RestController +public class OrderGiftController extends BaseController { + + @Autowired + private OrderGiftService orderGiftService; + @Autowired + private OrderDetlGiftService orderDetlGiftService; + @Autowired + private SnowflakeIdWorker snowflakeIdWorker; + @Autowired + private DocTypeService docTypeService; + @Autowired + private WrkDetlService wrkDetlService; + @Autowired + private WaitPakinService waitPakinService; + @Autowired + private LocDetlService locDetlService; + @Autowired + private WrkMastService wrkMastService; + @Autowired + private WrkMastLogService wrkMastLogService; + + @RequestMapping(value = "/orderGift/{id}/auth") + @ManagerAuth + public R get(@PathVariable("id") String id) { + return R.ok(orderGiftService.selectById(String.valueOf(id))); + } + + @RequestMapping(value = "/orderGift/list/auth") + @ManagerAuth + public R list(@RequestParam(defaultValue = "1")Integer curr, + @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){ + EntityWrapper<OrderGift> wrapper = new EntityWrapper<>(); + excludeTrash(param); + convert(param, wrapper); + allLike(OrderGift.class, param.keySet(), wrapper, condition); + if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} + return R.ok(orderGiftService.selectPage(new Page<>(curr, limit), wrapper)); + } + + private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){ + for (Map.Entry<String, Object> entry : map.entrySet()){ + 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.like(entry.getKey(), val); + } + } + } + + @PostMapping(value = "/orderGift/wrk/trace/auth") + @ManagerAuth + public R orderWrkTrace(@RequestParam("orderId") Long orderId) { + OrderGift order = orderGiftService.selectById(orderId); + if (null == order) { + return R.error("鍗曟嵁涓嶅瓨鍦�"); + } + // 鏁伴噺缁熻 + List<OrderDetlGift> orderDetls = orderDetlGiftService.selectByOrderId(orderId); + double totalQty = 0; + double wrkQty = 0; + double lackQty = 0; + double endQty = 0; + for (OrderDetlGift orderDetl : orderDetls) { + totalQty = totalQty + orderDetl.getAnfme(); + wrkQty = wrkQty + orderDetl.getWorkQty(); + endQty = endQty + orderDetl.getQty(); + double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D); + if (issued > 0.0) { + List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrigin(), null); + for (LocDetl locDetl : locDetls) { + if (issued > 0) { + issued = issued - locDetl.getAnfme(); + } else { + break; + } + } + } + if (issued > 0.0) { + lackQty = lackQty + issued; + } + } + // 浠诲姟杩芥函 + List<WrkTraceVo> wrkTraceVos = new ArrayList<>(); + List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNoGroupByMatnrOfSum(order.getOrderNo()); + for (WrkDetl wrkDetl : wrkDetls) { + WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime())); + if (wrkMast == null) { + WrkMastLog wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime())); + if (wrkMastLog.getIoType()==103){ + wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()).eq("io_type",53)); + } + if (wrkMastLog != null) { + wrkMast = new WrkMast(); + BeanUtils.copyProperties(wrkMastLog, wrkMast); + } else { + continue; + } + } + boolean exist = false; + for (WrkTraceVo vo : wrkTraceVos) { + if (vo.getWrkNo().equals(wrkMast.getWrkNo()) && vo.getIoTimeStr().equals(DateUtils.convert(wrkMast.getIoTime()))) { + vo.getWrkDetls().add(wrkDetl); + exist = true; + } + } + if (!exist) { + WrkTraceVo vo = new WrkTraceVo(wrkMast.getWrkNo(), DateUtils.convert(wrkMast.getIoTime()), wrkMast, wrkDetl); + wrkTraceVos.add(vo); + } + } + if (!Cools.isEmpty(wrkTraceVos) && wrkTraceVos.size() > 1) { + wrkTraceVos.sort((o1, o2) -> (int) (o2.getWrkMast().getIoTime().getTime() - o1.getWrkMast().getIoTime().getTime())); + } + return R.ok().add(Cools + .add("list", wrkTraceVos) + .add("orderNo", order.getOrderNo()) + .add("totalQty", totalQty) + .add("wrkQty", wrkQty) + .add("lackQty", lackQty) + .add("endQty",endQty) + ); + } + + @RequestMapping(value = "/orderGift/add/auth") + @ManagerAuth + public R add(OrderGift orderGift) { + orderGiftService.insert(orderGift); + return R.ok(); + } + + @RequestMapping(value = "/orderGift/update/auth") + @ManagerAuth + public R update(OrderGift order){ + if (Cools.isEmpty(order) || null == order.getId()){ + return R.error(); + } + + //璁㈠崟瀹岀粨鍓嶏紝鍒ゆ柇鏄惁瀛樺湪浣滀笟涓暟鎹紝瀛樺湪鍒欎笉鑳藉畬缁� + if(order.getSettle() == 4){ + int wrkCount = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no",order.getOrderNo())); + int pakinCount = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("order_no",order.getOrderNo())); + if (wrkCount > 0 || pakinCount > 0) { + throw new CoolException("瀛樺湪浣滀笟涓暟鎹紝涓嶈兘瀹岀粨銆傝妫�鏌ュ叆搴撻�氱煡妗e拰宸ヤ綔妗�"); + } + } + + order.setUpdateBy(getUserId()); + order.setUpdateTime(new Date()); + if (!orderGiftService.updateById(order)) { + throw new CoolException("淇敼璁㈠崟澶辫触"); + } + return R.ok(); + } + + @RequestMapping(value = "/orderGift/delete/auth") + @ManagerAuth + public R delete(@RequestParam Long orderId){ + orderGiftService.remove(orderId); + + return R.ok(); + } + + @RequestMapping(value = "/orderGift/export/auth") + @ManagerAuth + public R export(@RequestBody JSONObject param){ + EntityWrapper<OrderGift> wrapper = new EntityWrapper<>(); + List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); + Map<String, Object> map = excludeTrash(param.getJSONObject("orderGift")); + convert(map, wrapper); + List<OrderGift> list = orderGiftService.selectList(wrapper); + return R.ok(exportSupport(list, fields)); + } + + @RequestMapping(value = "/orderGiftQuery/auth") + @ManagerAuth + public R query(String condition) { + EntityWrapper<OrderGift> wrapper = new EntityWrapper<>(); + wrapper.like("id", condition); + Page<OrderGift> page = orderGiftService.selectPage(new Page<>(0, 10), wrapper); + List<Map<String, Object>> result = new ArrayList<>(); + for (OrderGift orderGift : page.getRecords()){ + Map<String, Object> map = new HashMap<>(); + map.put("id", orderGift.getId()); + map.put("value", orderGift.getId()); + result.add(map); + } + return R.ok(result); + } + + @RequestMapping(value = "/orderGift/check/column/auth") + @ManagerAuth + public R query(@RequestBody JSONObject param) { + Wrapper<OrderGift> wrapper = new EntityWrapper<OrderGift>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val")); + if (null != orderGiftService.selectOne(wrapper)){ + return R.parse(BaseRes.REPEAT).add(getComment(OrderGift.class, String.valueOf(param.get("key")))); + } + return R.ok(); + } + + @RequestMapping(value = "/orderGift/detl/all/auth") + @ManagerAuth + public R head(@RequestParam Long orderId){ + return R.ok().add(orderDetlGiftService.selectList(new EntityWrapper<OrderDetlGift>().eq("order_id", orderId))); + } + + @RequestMapping(value = "/orderGift/form/add/auth") + @ManagerAuth(memo = "鎵嬪姩娣诲姞璁㈠崟") + @Transactional + public R formAdd(@RequestBody OrderDomainParam param){ + if(Cools.isEmpty(param.getOrderNo())){ + String prefix = ""; + DocType docType = docTypeService.selectById(param.getDocType()); + if(!Cools.isEmpty(docType)){ + prefix = docType.getPakin() == 1 ? "RK" : "CK"; + } + param.setOrderNo(prefix + snowflakeIdWorker.nextId()); + } + OrderGift order = orderGiftService.selectByNo(param.getOrderNo()); + if (order != null) { + return R.error("鍗曟嵁缂栧彿宸插瓨鍦�"); + } + Date now = new Date(); + order = new OrderGift( + String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖] + param.getOrderNo(), // 璁㈠崟缂栧彿 + DateUtils.convert(now), // 鍗曟嵁鏃ユ湡 + param.getDocType(), // 鍗曟嵁绫诲瀷 + null, // 椤圭洰缂栧彿 + null, // + null, // 璋冩嫧椤圭洰缂栧彿 + null, // 鍒濆绁ㄦ嵁鍙� + null, // 绁ㄦ嵁鍙� + null, // 瀹㈡埛缂栧彿 + null, // 瀹㈡埛 + null, // 鑱旂郴鏂瑰紡 + null, // 鎿嶄綔浜哄憳 + null, // 鍚堣閲戦 + null, // 浼樻儬鐜� + null, // 浼樻儬閲戦 + null, // 閿�鍞垨閲囪喘璐圭敤鍚堣 + null, // 瀹炰粯閲戦 + null, // 浠樻绫诲瀷 + null, // 涓氬姟鍛� + null, // 缁撶畻澶╂暟 + null, // 閭垂鏀粯绫诲瀷 + null, // 閭垂 + null, // 浠樻鏃堕棿 + null, // 鍙戣揣鏃堕棿 + null, // 鐗╂祦鍚嶇О + null, // 鐗╂祦鍗曞彿 + 1L, // 璁㈠崟鐘舵�� + 1, // 鐘舵�� + getUserId(), // 娣诲姞浜哄憳 + now, // 娣诲姞鏃堕棿 + getUserId(), // 淇敼浜哄憳 + now, // 淇敼鏃堕棿 + null // 澶囨敞 + ); + if (!orderGiftService.insert(order)) { + throw new CoolException("淇濆瓨璁㈠崟涓绘。澶辫触"); + } + List<DetlDto> list = new ArrayList<>(); + for (OrderDetlGift orderDetl : param.getOrderDetlGiftList()) { + DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch()); + if (DetlDto.has(list, dto)) { + OrderDetlGift item = orderDetlGiftService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch()); + item.setAnfme(item.getAnfme() + orderDetl.getAnfme()); + if (!orderDetlGiftService.updateById(item)) { + throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗eけ璐�"); + } + } else { + list.add(dto); + orderDetl.setOrderId(order.getId()); + orderDetl.setOrderNo(order.getOrderNo()); + orderDetl.setCreateBy(getUserId()); + orderDetl.setCreateTime(now); + orderDetl.setUpdateBy(getUserId()); + orderDetl.setUpdateTime(now); + orderDetl.setStatus(1); + orderDetl.setQty(0.0D); + if (!orderDetlGiftService.insert(orderDetl)) { + throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗eけ璐�"); + } + } + } + return R.ok("璁㈠崟娣诲姞鎴愬姛"); + } + + @RequestMapping(value = "/orderGift/form/modify/auth") + @ManagerAuth(memo = "鎵嬪姩淇敼璁㈠崟") + @Transactional + public R formModify(@RequestBody OrderDomainParam param){ + OrderGift order = orderGiftService.selectById(param.getOrderId()); + if (order == null || order.getStatus() == 0) { + return R.error("璁㈠崟涓嶅瓨鍦�"); + } + Date now = new Date(); + Long userId = getUserId(); + // 淇敼涓绘。 + if (!param.getDocType().equals(order.getDocType())) { + order.setDocType(param.getDocType()); + order.setUpdateBy(userId); + order.setUpdateTime(now); + if (!orderGiftService.updateById(order)) { + throw new CoolException("淇敼璁㈠崟绫诲瀷澶辫触"); + } + } + // 淇敼鏄庣粏妗� +// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId()); + // 1.娓呯┖鏄庣粏妗� + if (!orderDetlGiftService.delete(new EntityWrapper<OrderDetlGift>().eq("order_id", order.getId()))) { + throw new CoolException("娓呯┖璁㈠崟鏄庣粏澶辫触"); + } + // 2.閲嶇粍鏁版嵁 + List<DetlDto> list = new ArrayList<>(); + for (OrderDetlGift orderDetl : param.getOrderDetlGiftList()) { + DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch()); + if (DetlDto.has(list, dto)) { + OrderDetlGift item = orderDetlGiftService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch()); + item.setAnfme(item.getAnfme() + orderDetl.getAnfme()); + if (!orderDetlGiftService.updateById(item)) { + throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗eけ璐�"); + } + } else { + list.add(dto); + orderDetl.setOrderId(order.getId()); + orderDetl.setOrderNo(order.getOrderNo()); + orderDetl.setCreateBy(getUserId()); + orderDetl.setCreateTime(now); + orderDetl.setUpdateBy(getUserId()); + orderDetl.setUpdateTime(now); + orderDetl.setStatus(1); + orderDetl.setQty(0.0D); + if (!orderDetlGiftService.insert(orderDetl)) { + throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗eけ璐�"); + } + } + } + return R.ok("璁㈠崟淇敼鎴愬姛"); + } + + @RequestMapping(value = "/orderGift/view/labelUp/file/auth") +// @ManagerAuth + public R viewLabelUpFile(@RequestParam("orderId") Long orderId){ +// int id = Integer.parseInt(orderId); + String savePath = "D:/orderGift/labelUp/file/"+orderId+"/"; // 鎸囧畾淇濆瓨鏂囦欢鐨勮矾寰� + try{ + List<FileSaveExampleUtil.FileDTO> fileDTOS = FileSaveExampleUtil.viewFileList(savePath); + return R.ok(fileDTOS); + }catch (Exception e){ + return R.error(); + } + } + + @RequestMapping(value = "/orderGift/insert/labelUp/file/auth") +// @ManagerAuth + public R insertLabelUpFile(@RequestParam("orderId") String orderId,@RequestParam MultipartFile file){ + String[] split = orderId.split("-"); + int id = Integer.parseInt(split[1]); + System.out.println("---寮�濮�---"); + String savePath = "D:/orderGift/labelUp/file/"+id+"/"; // 鎸囧畾淇濆瓨鏂囦欢鐨勮矾寰� + try{ + FileSaveExampleUtil.saveFile(file, savePath); + }catch (Exception e){ + return R.error(); + } + return R.ok(); + } + + @RequestMapping(value = "/orderGift/head/page/auth") + @ManagerAuth + public R head(@RequestParam(defaultValue = "1")Integer curr, + @RequestParam(defaultValue = "10")Integer limit, + @RequestParam(required = false)String orderByField, + @RequestParam(required = false)String orderByType, + @RequestParam Map<String, Object> param){ + EntityWrapper<OrderGift> wrapper = new EntityWrapper<>(); + excludeTrash(param); + convert(param, wrapper); + if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else { + wrapper.orderBy("settle").orderBy("create_time", false); + } + wrapper.eq("status", 1); + return R.ok(orderGiftService.selectPage(new Page<>(curr, limit), wrapper)); + } + + +} diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlGift.java b/src/main/java/com/zy/asrs/entity/OrderDetlGift.java new file mode 100644 index 0000000..81634be --- /dev/null +++ b/src/main/java/com/zy/asrs/entity/OrderDetlGift.java @@ -0,0 +1,488 @@ +package com.zy.asrs.entity; + +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableName; +import com.baomidou.mybatisplus.enums.IdType; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.core.common.Cools; +import com.core.common.SpringUtils; +import com.zy.asrs.service.OrderService; +import com.zy.system.entity.User; +import com.zy.system.service.UserService; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.Date; + +@Data +@TableName("man_order_detl_gift") +public class OrderDetlGift implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ApiModelProperty(value= "ID") + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 璁㈠崟鍐呯爜 + */ + @ApiModelProperty(value= "璁㈠崟鍐呯爜") + @TableField("order_id") + private Long orderId; + + /** + * 鍗曟嵁缂栧彿 + */ + @ApiModelProperty(value= "鍗曟嵁缂栧彿") + @TableField("order_no") + private String orderNo; + + /** + * 鏁伴噺 + */ + @ApiModelProperty(value= "鏁伴噺") + private Double anfme; + + @ApiModelProperty(value= "") + private Double qty; + + /** + * 鍟嗗搧缂栫爜 + */ + @ApiModelProperty(value= "鍟嗗搧缂栫爜") + private String matnr; + + /** + * 鍟嗗搧鍚嶇О + */ + @ApiModelProperty(value= "鍟嗗搧鍚嶇О") + private String maktx; + + /** + * 鎵瑰彿 + */ + @ApiModelProperty(value= "鎵瑰彿") + private String batch; + + /** + * 瑙勬牸 + */ + @ApiModelProperty(value= "瑙勬牸") + private String specs; + + /** + * 鍨嬪彿 + */ + @ApiModelProperty(value= "鍨嬪彿") + private String model; + + /** + * 棰滆壊 + */ + @ApiModelProperty(value= "棰滆壊") + private String color; + + /** + * 鍝佺墝 + */ + @ApiModelProperty(value= "鍝佺墝") + private String brand; + + /** + * 鍗曚綅 + */ + @ApiModelProperty(value= "鍗曚綅") + private String unit; + + /** + * 鍗曚环 + */ + @ApiModelProperty(value= "鍗曚环") + private Double price; + + /** + * sku + */ + @ApiModelProperty(value= "sku") + private String sku; + + /** + * 鍗曚綅閲� + */ + @ApiModelProperty(value= "鍗曚綅閲�") + private Double units; + + /** + * 鏉$爜 + */ + @ApiModelProperty(value= "鏉$爜") + private String barcode; + + /** + * 浜у湴 + */ + @ApiModelProperty(value= "浜у湴") + private String origin; + + /** + * 鍘傚 + */ + @ApiModelProperty(value= "鍘傚") + private String manu; + + /** + * 鐢熶骇鏃ユ湡 + */ + @ApiModelProperty(value= "鐢熶骇鏃ユ湡") + @TableField("manu_date") + private String manuDate; + + /** + * 鍝侀」鏁� + */ + @ApiModelProperty(value= "鍝侀」鏁�") + @TableField("item_num") + private String itemNum; + + /** + * 瀹夊叏搴撳瓨閲� + */ + @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�") + @TableField("safe_qty") + private Double safeQty; + + /** + * 閲嶉噺 + */ + @ApiModelProperty(value= "閲嶉噺") + private Double weight; + + /** + * 闀垮害 + */ + @ApiModelProperty(value= "闀垮害") + private Double length; + + /** + * 浣撶Н + */ + @ApiModelProperty(value= "浣撶Н") + private Double volume; + + /** + * 涓夋柟缂栫爜 + */ + @ApiModelProperty(value= "涓夋柟缂栫爜") + @TableField("three_code") + private String threeCode; + + /** + * 渚涘簲鍟� + */ + @ApiModelProperty(value= "渚涘簲鍟�") + private String supp; + + /** + * 渚涘簲鍟嗙紪鐮� + */ + @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�") + @TableField("supp_code") + private String suppCode; + + /** + * 鏄惁鎵规 1: 鏄� 0: 鍚� + */ + @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ") + @TableField("be_batch") + private Integer beBatch; + + /** + * 淇濊川鏈� + */ + @ApiModelProperty(value= "淇濊川鏈�") + @TableField("dead_time") + private String deadTime; + + /** + * 棰勮澶╂暟 + */ + @ApiModelProperty(value= "棰勮澶╂暟") + @TableField("dead_warn") + private Integer deadWarn; + + /** + * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 + */ + @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ") + private Integer source; + + /** + * 瑕佹眰妫�楠� 1: 鏄� 0: 鍚� + */ + @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ") + private Integer inspect; + + /** + * 鍗遍櫓鍝� 1: 鏄� 0: 鍚� + */ + @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ") + private Integer danger; + + /** + * 鐘舵�� 1: 姝e父 0: 绂佺敤 + */ + @ApiModelProperty(value= "鐘舵�� 1: 姝e父 0: 绂佺敤 ") + private Integer status; + + /** + * 娣诲姞浜哄憳 + */ + @ApiModelProperty(value= "娣诲姞浜哄憳") + @TableField("create_by") + private Long createBy; + + /** + * 娣诲姞鏃堕棿 + */ + @ApiModelProperty(value= "娣诲姞鏃堕棿") + @TableField("create_time") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** + * 淇敼浜哄憳 + */ + @ApiModelProperty(value= "淇敼浜哄憳") + @TableField("update_by") + private Long updateBy; + + /** + * 淇敼鏃堕棿 + */ + @ApiModelProperty(value= "淇敼鏃堕棿") + @TableField("update_time") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + /** + * 澶囨敞 + */ + @ApiModelProperty(value= "澶囨敞") + private String memo; + + @ApiModelProperty(value= "") + @TableField("work_qty") + private Double workQty; + + /** + * 閫�搴撴爣璁� + */ + @ApiModelProperty(value= "閫�搴撴爣璁�") + @TableField("tk_type") + private Integer tkType; + + @ApiModelProperty(value= "") + @TableField("roll_up") + private Long rollUp; + + public OrderDetlGift() {} + + public OrderDetlGift(Long orderId,String orderNo,Double anfme,Double qty,String matnr,String maktx,String batch,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Double workQty,Integer tkType,Long rollUp) { + this.orderId = orderId; + this.orderNo = orderNo; + this.anfme = anfme; + this.qty = qty; + this.matnr = matnr; + this.maktx = maktx; + this.batch = batch; + this.specs = specs; + this.model = model; + this.color = color; + this.brand = brand; + this.unit = unit; + this.price = price; + this.sku = sku; + this.units = units; + this.barcode = barcode; + this.origin = origin; + this.manu = manu; + this.manuDate = manuDate; + this.itemNum = itemNum; + this.safeQty = safeQty; + this.weight = weight; + this.length = length; + this.volume = volume; + this.threeCode = threeCode; + this.supp = supp; + this.suppCode = suppCode; + this.beBatch = beBatch; + this.deadTime = deadTime; + this.deadWarn = deadWarn; + this.source = source; + this.inspect = inspect; + this.danger = danger; + this.status = status; + this.createBy = createBy; + this.createTime = createTime; + this.updateBy = updateBy; + this.updateTime = updateTime; + this.memo = memo; + this.workQty = workQty; + this.tkType = tkType; + this.rollUp = rollUp; + } + +// OrderDetlGift orderDetlGift = new OrderDetlGift( +// null, // 璁㈠崟鍐呯爜 +// null, // 鍗曟嵁缂栧彿 +// null, // 鏁伴噺 +// null, // +// null, // 鍟嗗搧缂栫爜 +// null, // 鍟嗗搧鍚嶇О +// null, // 鎵瑰彿 +// null, // 瑙勬牸 +// null, // 鍨嬪彿 +// null, // 棰滆壊 +// null, // 鍝佺墝 +// null, // 鍗曚綅 +// null, // 鍗曚环 +// null, // sku +// null, // 鍗曚綅閲� +// null, // 鏉$爜 +// null, // 浜у湴 +// null, // 鍘傚 +// null, // 鐢熶骇鏃ユ湡 +// null, // 鍝侀」鏁� +// null, // 瀹夊叏搴撳瓨閲� +// null, // 閲嶉噺 +// null, // 闀垮害 +// null, // 浣撶Н +// null, // 涓夋柟缂栫爜 +// null, // 渚涘簲鍟� +// null, // 渚涘簲鍟嗙紪鐮� +// null, // 鏄惁鎵规 +// null, // 淇濊川鏈� +// null, // 棰勮澶╂暟 +// null, // 鍒惰喘 +// null, // 瑕佹眰妫�楠� +// null, // 鍗遍櫓鍝� +// null, // 鐘舵�� +// null, // 娣诲姞浜哄憳 +// null, // 娣诲姞鏃堕棿 +// null, // 淇敼浜哄憳 +// null, // 淇敼鏃堕棿 +// null, // 澶囨敞 +// null, // +// null, // 閫�搴撴爣璁� +// null // +// ); + + public String getOrderId$(){ + OrderService service = SpringUtils.getBean(OrderService.class); + Order order = service.selectById(this.orderId); + if (!Cools.isEmpty(order)){ + return String.valueOf(order.getId()); + } + return null; + } + + public String getBeBatch$(){ + if (null == this.beBatch){ return null; } + switch (this.beBatch){ + case 1: + return "鏄�"; + case 0: + return "鍚�"; + default: + return String.valueOf(this.beBatch); + } + } + + public String getSource$(){ + if (null == this.source){ return "鏈‘璁�"; } + switch (this.source){ + case 1: + return "宸茬‘璁�"; + default: + return "鏈‘璁�"; + } + } + + public String getInspect$(){ + if (null == this.inspect){ return null; } + switch (this.inspect){ + case 1: + return "鏄�"; + case 0: + return "鍚�"; + default: + return String.valueOf(this.inspect); + } + } + + public String getDanger$(){ + if (null == this.danger){ return null; } + switch (this.danger){ + case 1: + return "鏄�"; + case 0: + return "鍚�"; + default: + return String.valueOf(this.danger); + } + } + + public String getStatus$(){ + if (null == this.status){ return null; } + switch (this.status){ + case 1: + return "姝e父"; + case 0: + return "绂佺敤"; + default: + return String.valueOf(this.status); + } + } + + public String getCreateBy$(){ + UserService service = SpringUtils.getBean(UserService.class); + User user = service.selectById(this.createBy); + if (!Cools.isEmpty(user)){ + return String.valueOf(user.getNickname()); + } + return null; + } + + public String getCreateTime$(){ + if (Cools.isEmpty(this.createTime)){ + return ""; + } + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime); + } + + public String getUpdateBy$(){ + UserService service = SpringUtils.getBean(UserService.class); + User user = service.selectById(this.updateBy); + if (!Cools.isEmpty(user)){ + return String.valueOf(user.getNickname()); + } + return null; + } + + public String getUpdateTime$(){ + if (Cools.isEmpty(this.updateTime)){ + return ""; + } + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime); + } + + +} diff --git a/src/main/java/com/zy/asrs/entity/OrderGift.java b/src/main/java/com/zy/asrs/entity/OrderGift.java new file mode 100644 index 0000000..d25e803 --- /dev/null +++ b/src/main/java/com/zy/asrs/entity/OrderGift.java @@ -0,0 +1,447 @@ +package com.zy.asrs.entity; + +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.enums.IdType; +import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField; +import com.core.common.SpringUtils; +import com.zy.asrs.service.DocTypeService; +import java.text.SimpleDateFormat; +import java.util.Date; +import org.springframework.format.annotation.DateTimeFormat; +import com.zy.asrs.service.OrderSettleService; +import com.zy.system.service.UserService; +import com.zy.system.entity.User; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +@Data +@TableName("man_order_gift") +public class OrderGift implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ApiModelProperty(value= "ID") + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 缂栧彿 + */ + @ApiModelProperty(value= "缂栧彿") + private String uuid; + + /** + * 璁㈠崟缂栧彿 + */ + @ApiModelProperty(value= "璁㈠崟缂栧彿") + @TableField("order_no") + private String orderNo; + + /** + * 鍗曟嵁鏃ユ湡 + */ + @ApiModelProperty(value= "鍗曟嵁鏃ユ湡") + @TableField("order_time") + private String orderTime; + + /** + * 鍗曟嵁绫诲瀷 + */ + @ApiModelProperty(value= "鍗曟嵁绫诲瀷") + @TableField("doc_type") + private Long docType; + + /** + * 椤圭洰缂栧彿 + */ + @ApiModelProperty(value= "椤圭洰缂栧彿") + @TableField("item_id") + private Long itemId; + + @ApiModelProperty(value= "") + @TableField("item_name") + private String itemName; + + /** + * 璋冩嫧椤圭洰缂栧彿 + */ + @ApiModelProperty(value= "璋冩嫧椤圭洰缂栧彿") + @TableField("allot_item_id") + private Long allotItemId; + + /** + * 鍒濆绁ㄦ嵁鍙� + */ + @ApiModelProperty(value= "鍒濆绁ㄦ嵁鍙�") + @TableField("def_number") + private String defNumber; + + /** + * 绁ㄦ嵁鍙� + */ + @ApiModelProperty(value= "绁ㄦ嵁鍙�") + private String number; + + /** + * 瀹㈡埛缂栧彿 + */ + @ApiModelProperty(value= "瀹㈡埛缂栧彿") + private Long cstmr; + + /** + * 瀹㈡埛 + */ + @ApiModelProperty(value= "瀹㈡埛") + @TableField("cstmr_name") + private String cstmrName; + + /** + * 鑱旂郴鏂瑰紡 + */ + @ApiModelProperty(value= "鑱旂郴鏂瑰紡") + private String tel; + + /** + * 鎿嶄綔浜哄憳 + */ + @ApiModelProperty(value= "鎿嶄綔浜哄憳") + @TableField("oper_memb") + private String operMemb; + + /** + * 鍚堣閲戦 + */ + @ApiModelProperty(value= "鍚堣閲戦") + @TableField("total_fee") + private Double totalFee; + + /** + * 浼樻儬鐜� + */ + @ApiModelProperty(value= "浼樻儬鐜�") + private Double discount; + + /** + * 浼樻儬閲戦 + */ + @ApiModelProperty(value= "浼樻儬閲戦") + @TableField("discount_fee") + private Double discountFee; + + /** + * 閿�鍞垨閲囪喘璐圭敤鍚堣 + */ + @ApiModelProperty(value= "閿�鍞垨閲囪喘璐圭敤鍚堣") + @TableField("other_fee") + private Double otherFee; + + /** + * 瀹炰粯閲戦 + */ + @ApiModelProperty(value= "瀹炰粯閲戦") + @TableField("act_fee") + private Double actFee; + + /** + * 浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处 + */ + @ApiModelProperty(value= "浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处 ") + @TableField("pay_type") + private Integer payType; + + /** + * 涓氬姟鍛� + */ + @ApiModelProperty(value= "涓氬姟鍛�") + private String salesman; + + /** + * 缁撶畻澶╂暟 + */ + @ApiModelProperty(value= "缁撶畻澶╂暟") + @TableField("account_day") + private Integer accountDay; + + /** + * 閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻 + */ + @ApiModelProperty(value= "閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻 ") + @TableField("post_fee_type") + private Integer postFeeType; + + /** + * 閭垂 + */ + @ApiModelProperty(value= "閭垂") + @TableField("post_fee") + private Double postFee; + + /** + * 浠樻鏃堕棿 + */ + @ApiModelProperty(value= "浠樻鏃堕棿") + @TableField("pay_time") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date payTime; + + /** + * 鍙戣揣鏃堕棿 + */ + @ApiModelProperty(value= "鍙戣揣鏃堕棿") + @TableField("send_time") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date sendTime; + + /** + * 鐗╂祦鍚嶇О + */ + @ApiModelProperty(value= "鐗╂祦鍚嶇О") + @TableField("ship_name") + private String shipName; + + /** + * 鐗╂祦鍗曞彿 + */ + @ApiModelProperty(value= "鐗╂祦鍗曞彿") + @TableField("ship_code") + private String shipCode; + + /** + * 璁㈠崟鐘舵�� + */ + @ApiModelProperty(value= "璁㈠崟鐘舵��") + private Long settle; + + /** + * 鐘舵�� 1: 姝e父 0: 绂佺敤 + */ + @ApiModelProperty(value= "鐘舵�� 1: 姝e父 0: 绂佺敤 ") + private Integer status; + + /** + * 娣诲姞浜哄憳 + */ + @ApiModelProperty(value= "娣诲姞浜哄憳") + @TableField("create_by") + private Long createBy; + + /** + * 娣诲姞鏃堕棿 + */ + @ApiModelProperty(value= "娣诲姞鏃堕棿") + @TableField("create_time") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** + * 淇敼浜哄憳 + */ + @ApiModelProperty(value= "淇敼浜哄憳") + @TableField("update_by") + private Long updateBy; + + /** + * 淇敼鏃堕棿 + */ + @ApiModelProperty(value= "淇敼鏃堕棿") + @TableField("update_time") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + /** + * 澶囨敞 + */ + @ApiModelProperty(value= "澶囨敞") + private String memo; + + public OrderGift() {} + + public OrderGift(String uuid,String orderNo,String orderTime,Long docType,Long itemId,String itemName,Long allotItemId,String defNumber,String number,Long cstmr,String cstmrName,String tel,String operMemb,Double totalFee,Double discount,Double discountFee,Double otherFee,Double actFee,Integer payType,String salesman,Integer accountDay,Integer postFeeType,Double postFee,Date payTime,Date sendTime,String shipName,String shipCode,Long settle,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) { + this.uuid = uuid; + this.orderNo = orderNo; + this.orderTime = orderTime; + this.docType = docType; + this.itemId = itemId; + this.itemName = itemName; + this.allotItemId = allotItemId; + this.defNumber = defNumber; + this.number = number; + this.cstmr = cstmr; + this.cstmrName = cstmrName; + this.tel = tel; + this.operMemb = operMemb; + this.totalFee = totalFee; + this.discount = discount; + this.discountFee = discountFee; + this.otherFee = otherFee; + this.actFee = actFee; + this.payType = payType; + this.salesman = salesman; + this.accountDay = accountDay; + this.postFeeType = postFeeType; + this.postFee = postFee; + this.payTime = payTime; + this.sendTime = sendTime; + this.shipName = shipName; + this.shipCode = shipCode; + this.settle = settle; + this.status = status; + this.createBy = createBy; + this.createTime = createTime; + this.updateBy = updateBy; + this.updateTime = updateTime; + this.memo = memo; + } + +// OrderGift orderGift = new OrderGift( +// null, // 缂栧彿[闈炵┖] +// null, // 璁㈠崟缂栧彿 +// null, // 鍗曟嵁鏃ユ湡 +// null, // 鍗曟嵁绫诲瀷 +// null, // 椤圭洰缂栧彿 +// null, // +// null, // 璋冩嫧椤圭洰缂栧彿 +// null, // 鍒濆绁ㄦ嵁鍙� +// null, // 绁ㄦ嵁鍙� +// null, // 瀹㈡埛缂栧彿 +// null, // 瀹㈡埛 +// null, // 鑱旂郴鏂瑰紡 +// null, // 鎿嶄綔浜哄憳 +// null, // 鍚堣閲戦 +// null, // 浼樻儬鐜� +// null, // 浼樻儬閲戦 +// null, // 閿�鍞垨閲囪喘璐圭敤鍚堣 +// null, // 瀹炰粯閲戦 +// null, // 浠樻绫诲瀷 +// null, // 涓氬姟鍛� +// null, // 缁撶畻澶╂暟 +// null, // 閭垂鏀粯绫诲瀷 +// null, // 閭垂 +// null, // 浠樻鏃堕棿 +// null, // 鍙戣揣鏃堕棿 +// null, // 鐗╂祦鍚嶇О +// null, // 鐗╂祦鍗曞彿 +// null, // 璁㈠崟鐘舵�� +// null, // 鐘舵�� +// null, // 娣诲姞浜哄憳 +// null, // 娣诲姞鏃堕棿 +// null, // 淇敼浜哄憳 +// null, // 淇敼鏃堕棿 +// null // 澶囨敞 +// ); + + public String getDocType$(){ + DocTypeService service = SpringUtils.getBean(DocTypeService.class); + DocType docType = service.selectById(this.docType); + if (!Cools.isEmpty(docType)){ + return String.valueOf(docType.getDocName()); + } + return null; + } + + public String getPayType$(){ + if (null == this.payType){ return null; } + switch (this.payType){ + case 1: + return "鐜伴噾"; + case 2: + return "璁拌处"; + default: + return String.valueOf(this.payType); + } + } + + public String getPostFeeType$(){ + if (null == this.postFeeType){ return null; } + switch (this.postFeeType){ + case 1: + return "鍦ㄧ嚎鏀粯"; + case 2: + return "璐у埌浠樻"; + default: + return String.valueOf(this.postFeeType); + } + } + + public String getPayTime$(){ + if (Cools.isEmpty(this.payTime)){ + return ""; + } + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.payTime); + } + + public String getSendTime$(){ + if (Cools.isEmpty(this.sendTime)){ + return ""; + } + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.sendTime); + } + + public String getSettle$(){ + OrderSettleService service = SpringUtils.getBean(OrderSettleService.class); + OrderSettle orderSettle = service.selectById(this.settle); + if (!Cools.isEmpty(orderSettle)){ + return String.valueOf(orderSettle.getSettleName()); + } + return null; + } + + public String getStatus$(){ + if (null == this.status){ return null; } + switch (this.status){ + case 1: + return "姝e父"; + case 0: + return "绂佺敤"; + default: + return String.valueOf(this.status); + } + } + + public String getCreateBy$(){ + UserService service = SpringUtils.getBean(UserService.class); + User user = service.selectById(this.createBy); + if (!Cools.isEmpty(user)){ + return String.valueOf(user.getUsername()); + } + return null; + } + + public String getCreateTime$(){ + if (Cools.isEmpty(this.createTime)){ + return ""; + } + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime); + } + + public String getUpdateBy$(){ + UserService service = SpringUtils.getBean(UserService.class); + User user = service.selectById(this.updateBy); + if (!Cools.isEmpty(user)){ + return String.valueOf(user.getUsername()); + } + return null; + } + + public String getUpdateTime$(){ + if (Cools.isEmpty(this.updateTime)){ + return ""; + } + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime); + } + + public String getTkType(){ + DocTypeService service = SpringUtils.getBean(DocTypeService.class); + DocType docType = service.selectById(this.docType); + if (!Cools.isEmpty(docType)){ + return docType.getPakout().toString(); + } + return "0"; + } + +} diff --git a/src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java b/src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java index c095080..cf627d8 100644 --- a/src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java +++ b/src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java @@ -1,6 +1,7 @@ package com.zy.asrs.entity.param; import com.zy.asrs.entity.OrderDetl; +import com.zy.asrs.entity.OrderDetlGift; import lombok.Data; import java.util.List; @@ -19,5 +20,7 @@ private List<OrderDetl> orderDetlList; + private List<OrderDetlGift> orderDetlGiftList; + } diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlGiftMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlGiftMapper.java new file mode 100644 index 0000000..238136b --- /dev/null +++ b/src/main/java/com/zy/asrs/mapper/OrderDetlGiftMapper.java @@ -0,0 +1,15 @@ +package com.zy.asrs.mapper; + +import com.zy.asrs.entity.OrderDetlGift; +import com.baomidou.mybatisplus.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +@Mapper +@Repository +public interface OrderDetlGiftMapper extends BaseMapper<OrderDetlGift> { + + OrderDetlGift selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch); + +} diff --git a/src/main/java/com/zy/asrs/mapper/OrderGiftMapper.java b/src/main/java/com/zy/asrs/mapper/OrderGiftMapper.java new file mode 100644 index 0000000..a45382d --- /dev/null +++ b/src/main/java/com/zy/asrs/mapper/OrderGiftMapper.java @@ -0,0 +1,12 @@ +package com.zy.asrs.mapper; + +import com.zy.asrs.entity.OrderGift; +import com.baomidou.mybatisplus.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; + +@Mapper +@Repository +public interface OrderGiftMapper extends BaseMapper<OrderGift> { + +} diff --git a/src/main/java/com/zy/asrs/service/OrderDetlGiftService.java b/src/main/java/com/zy/asrs/service/OrderDetlGiftService.java new file mode 100644 index 0000000..6c5fdf1 --- /dev/null +++ b/src/main/java/com/zy/asrs/service/OrderDetlGiftService.java @@ -0,0 +1,12 @@ +package com.zy.asrs.service; + +import com.zy.asrs.entity.OrderDetlGift; +import com.baomidou.mybatisplus.service.IService; + +import java.util.List; + +public interface OrderDetlGiftService extends IService<OrderDetlGift> { + + List<OrderDetlGift> selectByOrderId(Long orderId); + OrderDetlGift selectItem(Long orderId, String matnr, String batch); +} diff --git a/src/main/java/com/zy/asrs/service/OrderGiftService.java b/src/main/java/com/zy/asrs/service/OrderGiftService.java new file mode 100644 index 0000000..c94c217 --- /dev/null +++ b/src/main/java/com/zy/asrs/service/OrderGiftService.java @@ -0,0 +1,10 @@ +package com.zy.asrs.service; + +import com.zy.asrs.entity.OrderGift; +import com.baomidou.mybatisplus.service.IService; + +public interface OrderGiftService extends IService<OrderGift> { + public void remove(Long orderId) ; + + public OrderGift selectByNo(String orderNo) ; +} diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlGiftServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlGiftServiceImpl.java new file mode 100644 index 0000000..a0fbff3 --- /dev/null +++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlGiftServiceImpl.java @@ -0,0 +1,23 @@ +package com.zy.asrs.service.impl; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.zy.asrs.mapper.OrderDetlGiftMapper; +import com.zy.asrs.entity.OrderDetlGift; +import com.zy.asrs.service.OrderDetlGiftService; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service("orderDetlGiftService") +public class OrderDetlGiftServiceImpl extends ServiceImpl<OrderDetlGiftMapper, OrderDetlGift> implements OrderDetlGiftService { + @Override + public List<OrderDetlGift> selectByOrderId(Long orderId) { + return this.selectList(new EntityWrapper<OrderDetlGift>().eq("order_id", orderId)); + } + + @Override + public OrderDetlGift selectItem(Long orderId, String matnr, String batch) { + return this.baseMapper.selectItem(orderId, matnr, batch); + } +} diff --git a/src/main/java/com/zy/asrs/service/impl/OrderGiftServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderGiftServiceImpl.java new file mode 100644 index 0000000..f6e2103 --- /dev/null +++ b/src/main/java/com/zy/asrs/service/impl/OrderGiftServiceImpl.java @@ -0,0 +1,40 @@ +package com.zy.asrs.service.impl; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.core.common.Cools; +import com.core.exception.CoolException; +import com.zy.asrs.entity.Order; +import com.zy.asrs.entity.OrderDetlGift; +import com.zy.asrs.mapper.OrderGiftMapper; +import com.zy.asrs.entity.OrderGift; +import com.zy.asrs.service.OrderDetlGiftService; +import com.zy.asrs.service.OrderGiftService; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service("orderGiftService") +public class OrderGiftServiceImpl extends ServiceImpl<OrderGiftMapper, OrderGift> implements OrderGiftService { + + @Autowired + private OrderDetlGiftService orderDetlGiftService; + + @Override + public void remove(Long orderId) { + if (!this.deleteById(orderId)) { + throw new CoolException("鍒犻櫎鍗曟嵁澶辫触"); + } + orderDetlGiftService.delete(new EntityWrapper<OrderDetlGift>().eq("order_id", orderId)); + } + + @Override + public OrderGift selectByNo(String orderNo) { + List<OrderGift> orderList = this.selectList(new EntityWrapper<OrderGift>().eq("order_no", orderNo)); + if (Cools.isEmpty(orderList)) { + return null; + } + return orderList.get(0); + } +} diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java index 84d5216..795be34 100644 --- a/src/main/java/com/zy/common/CodeBuilder.java +++ b/src/main/java/com/zy/common/CodeBuilder.java @@ -17,10 +17,10 @@ // generator.table="sys_host"; // sqlserver generator.sqlOsType = SqlOsType.SQL_SERVER; - generator.url="127.0.0.1:1433;databasename=srjtasrs"; + generator.url="127.0.0.1:50948;databasename=srjtasrs"; generator.username="sa"; generator.password="sa@123"; - generator.table="asr_bas_rgv"; + generator.table="man_order_gift"; generator.packagePath="com.zy.asrs"; generator.build(); } diff --git a/src/main/java/orderDetlGift.sql b/src/main/java/orderDetlGift.sql new file mode 100644 index 0000000..cbe7e6e --- /dev/null +++ b/src/main/java/orderDetlGift.sql @@ -0,0 +1,18 @@ +-- save orderDetlGift record +-- mysql +insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderDetlGift/orderDetlGift.html', 'orderDetlGift绠$悊', null , '2', null , '1'); + +insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderDetlGift#view', '鏌ヨ', '', '3', '0', '1'); +insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderDetlGift#btn-add', '鏂板', '', '3', '1', '1'); +insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderDetlGift#btn-edit', '缂栬緫', '', '3', '2', '1'); +insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderDetlGift#btn-delete', '鍒犻櫎', '', '3', '3', '1'); +insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderDetlGift#btn-export', '瀵煎嚭', '', '3', '4', '1'); + +-- sqlserver +insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderDetlGift/orderDetlGift.html', N'orderDetlGift绠$悊', null, '2', null, '1'); + +insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderDetlGift#view', N'鏌ヨ', '', '3', '0', '1'); +insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderDetlGift#btn-add', N'鏂板', '', '3', '1', '1'); +insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderDetlGift#btn-edit', N'缂栬緫', '', '3', '2', '1'); +insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderDetlGift#btn-delete', N'鍒犻櫎', '', '3', '3', '1'); +insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderDetlGift#btn-export', N'瀵煎嚭', '', '3', '4', '1'); diff --git a/src/main/java/orderGift.sql b/src/main/java/orderGift.sql new file mode 100644 index 0000000..93e0fcf --- /dev/null +++ b/src/main/java/orderGift.sql @@ -0,0 +1,18 @@ +-- save orderGift record +-- mysql +insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderGift/orderGift.html', 'orderGift绠$悊', null , '2', null , '1'); + +insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderGift#view', '鏌ヨ', '', '3', '0', '1'); +insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderGift#btn-add', '鏂板', '', '3', '1', '1'); +insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderGift#btn-edit', '缂栬緫', '', '3', '2', '1'); +insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderGift#btn-delete', '鍒犻櫎', '', '3', '3', '1'); +insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderGift#btn-export', '瀵煎嚭', '', '3', '4', '1'); + +-- sqlserver +insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderGift/orderGift.html', N'鏍稿鍗曟嵁绠$悊', '40524', '2', '11', '1'); + +insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderGift#view', N'鏌ヨ', '60604', '3', '0', '1'); +insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderGift#btn-add', N'鏂板', '60604', '3', '1', '1'); +insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderGift#btn-edit', N'缂栬緫', '60604', '3', '2', '1'); +insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderGift#btn-delete', N'鍒犻櫎', '60604', '3', '3', '1'); +insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderGift#btn-export', N'瀵煎嚭', '60604', '3', '4', '1'); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 126d6ee..3cddd4a 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -16,7 +16,7 @@ # url: jdbc:sqlserver://127.0.0.1:49977;databasename=srjtasrs # username: sa # password: sa@123 -# url: jdbc:sqlserver://192.168.4.15:1433;databasename=srjtasrs +# url: jdbc:sqlserver://127.0.0.1:50948;databasename=srjtasrs # username: sa # password: sa@123 mvc: diff --git a/src/main/resources/mapper/OrderDetlGiftMapper.xml b/src/main/resources/mapper/OrderDetlGiftMapper.xml new file mode 100644 index 0000000..88b7d84 --- /dev/null +++ b/src/main/resources/mapper/OrderDetlGiftMapper.xml @@ -0,0 +1,68 @@ +<?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.zy.asrs.mapper.OrderDetlGiftMapper"> + + <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> + <resultMap id="BaseResultMap" type="com.zy.asrs.entity.OrderDetlGift"> + <id column="id" property="id" /> + <result column="order_id" property="orderId" /> + <result column="order_no" property="orderNo" /> + <result column="anfme" property="anfme" /> + <result column="qty" property="qty" /> + <result column="matnr" property="matnr" /> + <result column="maktx" property="maktx" /> + <result column="batch" property="batch" /> + <result column="specs" property="specs" /> + <result column="model" property="model" /> + <result column="color" property="color" /> + <result column="brand" property="brand" /> + <result column="unit" property="unit" /> + <result column="price" property="price" /> + <result column="sku" property="sku" /> + <result column="units" property="units" /> + <result column="barcode" property="barcode" /> + <result column="origin" property="origin" /> + <result column="manu" property="manu" /> + <result column="manu_date" property="manuDate" /> + <result column="item_num" property="itemNum" /> + <result column="safe_qty" property="safeQty" /> + <result column="weight" property="weight" /> + <result column="length" property="length" /> + <result column="volume" property="volume" /> + <result column="three_code" property="threeCode" /> + <result column="supp" property="supp" /> + <result column="supp_code" property="suppCode" /> + <result column="be_batch" property="beBatch" /> + <result column="dead_time" property="deadTime" /> + <result column="dead_warn" property="deadWarn" /> + <result column="source" property="source" /> + <result column="inspect" property="inspect" /> + <result column="danger" property="danger" /> + <result column="status" property="status" /> + <result column="create_by" property="createBy" /> + <result column="create_time" property="createTime" /> + <result column="update_by" property="updateBy" /> + <result column="update_time" property="updateTime" /> + <result column="memo" property="memo" /> + <result column="work_qty" property="workQty" /> + <result column="tk_type" property="tkType" /> + <result column="roll_up" property="rollUp" /> + + </resultMap> + + <select id="selectItem" resultMap="BaseResultMap"> + select * from man_order_detl_gift + where 1=1 + and order_id = #{orderId} + and matnr = #{matnr} + <choose> + <when test="batch != null and batch != ''"> + and batch = #{batch} + </when> + <otherwise> + and (batch IS NULL OR batch = '') + </otherwise> + </choose> + </select> + +</mapper> diff --git a/src/main/resources/mapper/OrderGiftMapper.xml b/src/main/resources/mapper/OrderGiftMapper.xml new file mode 100644 index 0000000..3bd176e --- /dev/null +++ b/src/main/resources/mapper/OrderGiftMapper.xml @@ -0,0 +1,45 @@ +<?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.zy.asrs.mapper.OrderGiftMapper"> + + <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> + <resultMap id="BaseResultMap" type="com.zy.asrs.entity.OrderGift"> + <id column="id" property="id" /> + <result column="uuid" property="uuid" /> + <result column="order_no" property="orderNo" /> + <result column="order_time" property="orderTime" /> + <result column="doc_type" property="docType" /> + <result column="item_id" property="itemId" /> + <result column="item_name" property="itemName" /> + <result column="allot_item_id" property="allotItemId" /> + <result column="def_number" property="defNumber" /> + <result column="number" property="number" /> + <result column="cstmr" property="cstmr" /> + <result column="cstmr_name" property="cstmrName" /> + <result column="tel" property="tel" /> + <result column="oper_memb" property="operMemb" /> + <result column="total_fee" property="totalFee" /> + <result column="discount" property="discount" /> + <result column="discount_fee" property="discountFee" /> + <result column="other_fee" property="otherFee" /> + <result column="act_fee" property="actFee" /> + <result column="pay_type" property="payType" /> + <result column="salesman" property="salesman" /> + <result column="account_day" property="accountDay" /> + <result column="post_fee_type" property="postFeeType" /> + <result column="post_fee" property="postFee" /> + <result column="pay_time" property="payTime" /> + <result column="send_time" property="sendTime" /> + <result column="ship_name" property="shipName" /> + <result column="ship_code" property="shipCode" /> + <result column="settle" property="settle" /> + <result column="status" property="status" /> + <result column="create_by" property="createBy" /> + <result column="create_time" property="createTime" /> + <result column="update_by" property="updateBy" /> + <result column="update_time" property="updateTime" /> + <result column="memo" property="memo" /> + + </resultMap> + +</mapper> diff --git a/src/main/webapp/static/js/orderDetlGift/orderDetlGift.js b/src/main/webapp/static/js/orderDetlGift/orderDetlGift.js new file mode 100644 index 0000000..2ee0e49 --- /dev/null +++ b/src/main/webapp/static/js/orderDetlGift/orderDetlGift.js @@ -0,0 +1,297 @@ +var pageCurr; +layui.config({ + base: baseUrl + "/static/layui/lay/modules/" +}).use(['table','laydate', 'form', 'admin'], function(){ + var table = layui.table; + var $ = layui.jquery; + var layer = layui.layer; + var layDate = layui.laydate; + var form = layui.form; + var admin = layui.admin; + + // 鏁版嵁娓叉煋 + tableIns = table.render({ + elem: '#orderDetlGift', + headers: {token: localStorage.getItem('token')}, + url: baseUrl+'/orderDetlGift/list/auth', + page: true, + limit: 15, + limits: [15, 30, 50, 100, 200, 500], + toolbar: '#toolbar', + cellMinWidth: 50, + height: 'full-120', + cols: [[ + {type: 'checkbox'} + ,{field: 'id', align: 'center',title: 'ID'} + ,{field: 'orderId$', align: 'center',title: '璁㈠崟鍐呯爜'} + ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿'} + ,{field: 'anfme', align: 'center',title: '鏁伴噺'} + ,{field: 'qty', align: 'center',title: ''} + ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜'} + ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'} + ,{field: 'batch', align: 'center',title: '鎵瑰彿'} + ,{field: 'specs', align: 'center',title: '瑙勬牸'} + ,{field: 'model', align: 'center',title: '鍨嬪彿'} + ,{field: 'color', align: 'center',title: '棰滆壊'} + ,{field: 'brand', align: 'center',title: '鍝佺墝'} + ,{field: 'unit', align: 'center',title: '鍗曚綅'} + ,{field: 'price', align: 'center',title: '鍗曚环'} + ,{field: 'sku', align: 'center',title: 'sku'} + ,{field: 'units', align: 'center',title: '鍗曚綅閲�'} + ,{field: 'barcode', align: 'center',title: '鏉$爜'} + ,{field: 'origin', align: 'center',title: '浜у湴'} + ,{field: 'manu', align: 'center',title: '鍘傚'} + ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡'} + ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�'} + ,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�'} + ,{field: 'weight', align: 'center',title: '閲嶉噺'} + ,{field: 'length', align: 'center',title: '闀垮害'} + ,{field: 'volume', align: 'center',title: '浣撶Н'} + ,{field: 'threeCode', align: 'center',title: '涓夋柟缂栫爜'} + ,{field: 'supp', align: 'center',title: '渚涘簲鍟�'} + ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�'} + ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规'} + ,{field: 'deadTime', align: 'center',title: '淇濊川鏈�'} + ,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟'} + ,{field: 'source$', align: 'center',title: '鍒惰喘'} + ,{field: 'inspect$', align: 'center',title: '瑕佹眰妫�楠�'} + ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�'} + ,{field: 'status$', align: 'center',title: '鐘舵��'} + ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'} + ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'} + ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'} + ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'} + ,{field: 'memo', align: 'center',title: '澶囨敞'} + ,{field: 'workQty', align: 'center',title: ''} + ,{field: 'tkType', align: 'center',title: '閫�搴撴爣璁�'} + ,{field: 'rollUp', align: 'center',title: ''} + + ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120} + ]], + request: { + pageName: 'curr', + pageSize: 'limit' + }, + parseData: function (res) { + return { + 'code': res.code, + 'msg': res.msg, + 'count': res.data.total, + 'data': res.data.records + } + }, + response: { + statusCode: 200 + }, + done: function(res, curr, count) { + if (res.code === 403) { + top.location.href = baseUrl+"/"; + } + pageCurr=curr; + limit(); + } + }); + + // 鐩戝惉鎺掑簭浜嬩欢 + table.on('sort(orderDetlGift)', function (obj) { + var searchData = {}; + $.each($('#search-box [name]').serializeArray(), function() { + searchData[this.name] = this.value; + }); + searchData['orderByField'] = obj.field; + searchData['orderByType'] = obj.type; + tableIns.reload({ + where: searchData, + page: {curr: 1} + }); + }); + + // 鐩戝惉澶村伐鍏锋爮浜嬩欢 + table.on('toolbar(orderDetlGift)', function (obj) { + var checkStatus = table.checkStatus(obj.config.id).data; + switch(obj.event) { + case 'addData': + showEditModel(); + break; + case 'deleteData': + if (checkStatus.length === 0) { + layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2}); + return; + } + del(checkStatus.map(function (d) { + return d.id; + })); + break; + case 'exportData': + admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){ + var titles=[]; + var fields=[]; + obj.config.cols[0].map(function (col) { + if (col.type === 'normal' && col.hide === false && col.toolbar == null) { + titles.push(col.title); + fields.push(col.field); + } + }); + var exportData = {}; + $.each($('#search-box [name]').serializeArray(), function() { + exportData[this.name] = this.value; + }); + var param = { + 'orderDetlGift': exportData, + 'fields': fields + }; + $.ajax({ + url: baseUrl+"/orderDetlGift/export/auth", + headers: {'token': localStorage.getItem('token')}, + data: JSON.stringify(param), + dataType:'json', + contentType:'application/json;charset=UTF-8', + method: 'POST', + success: function (res) { + layer.closeAll(); + if (res.code === 200) { + table.exportFile(titles,res.data,'xls'); + } else if (res.code === 403) { + top.location.href = baseUrl+"/"; + } else { + layer.msg(res.msg, {icon: 2}) + } + } + }); + }); + break; + } + }); + + // 鐩戝惉琛屽伐鍏蜂簨浠� + table.on('tool(orderDetlGift)', function(obj){ + var data = obj.data; + switch (obj.event) { + case 'edit': + showEditModel(data); + break; + case "del": + del([data.id]); + break; + } + }); + + /* 寮圭獥 - 鏂板銆佷慨鏀� */ + function showEditModel(mData) { + admin.open({ + type: 1, + area: '600px', + title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��', + content: $('#editDialog').html(), + success: function (layero, dIndex) { + layDateRender(mData); + form.val('detail', mData); + form.on('submit(editSubmit)', function (data) { + var loadIndex = layer.load(2); + $.ajax({ + url: baseUrl+"/orderDetlGift/"+(mData?'update':'add')+"/auth", + headers: {'token': localStorage.getItem('token')}, + data: data.field, + method: 'POST', + success: function (res) { + layer.close(loadIndex); + if (res.code === 200){ + layer.close(dIndex); + layer.msg(res.msg, {icon: 1}); + tableReload(); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + }else { + layer.msg(res.msg, {icon: 2}); + } + } + }) + return false; + }); + $(layero).children('.layui-layer-content').css('overflow', 'visible'); + layui.form.render('select'); + } + }); + } + + /* 鍒犻櫎 */ + function del(ids) { + layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', { + skin: 'layui-layer-admin', + shade: .1 + }, function (i) { + layer.close(i); + var loadIndex = layer.load(2); + $.ajax({ + url: baseUrl+"/orderDetlGift/delete/auth", + headers: {'token': localStorage.getItem('token')}, + data: {ids: ids}, + method: 'POST', + success: function (res) { + layer.close(loadIndex); + if (res.code === 200){ + layer.msg(res.msg, {icon: 1}); + tableReload(); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + } else { + layer.msg(res.msg, {icon: 2}); + } + } + }) + }); + } + + // 鎼滅储 + form.on('submit(search)', function (data) { + pageCurr = 1; + tableReload(false); + }); + + // 閲嶇疆 + form.on('submit(reset)', function (data) { + pageCurr = 1; + clearFormVal($('#search-box')); + tableReload(false); + }); + + // 鏃堕棿閫夋嫨鍣� + function layDateRender(data) { + setTimeout(function () { + layDate.render({ + elem: '.layui-laydate-range' + ,type: 'datetime' + ,range: true + }); + layDate.render({ + elem: '#createTime\\$', + type: 'datetime', + value: data!==undefined?data['createTime\\$']:null + }); + layDate.render({ + elem: '#updateTime\\$', + type: 'datetime', + value: data!==undefined?data['updateTime\\$']:null + }); + + }, 300); + } + layDateRender(); + +}); + +// 鍏抽棴鍔ㄤ綔 +$(document).on('click','#data-detail-close', function () { + parent.layer.closeAll(); +}); + +function tableReload(child) { + var searchData = {}; + $.each($('#search-box [name]').serializeArray(), function() { + searchData[this.name] = this.value; + }); + tableIns.reload({ + where: searchData, + page: {curr: pageCurr} + }); +} diff --git a/src/main/webapp/static/js/orderGift/orderGift.js b/src/main/webapp/static/js/orderGift/orderGift.js new file mode 100644 index 0000000..944a632 --- /dev/null +++ b/src/main/webapp/static/js/orderGift/orderGift.js @@ -0,0 +1,871 @@ +var insTbCount = 0; +var tableCache2 = []; +layui.config({ + base: baseUrl + "/static/layui/lay/modules/" +}).extend({ + notice: 'notice/notice', +}).use(['layer', 'form', 'table','upload','element', 'util', 'admin', 'xmSelect', 'laydate', 'tableMerge', 'notice'], function () { + var $ = layui.jquery; + var layer = layui.layer; + var form = layui.form; + var table = layui.table; + var util = layui.util; + var upload = layui.upload; + var admin = layui.admin; + var xmSelect = layui.xmSelect; + var layDate = layui.laydate; + var laytpl = layui.laytpl; + var tableMerge = layui.tableMerge; + var notice = layui.notice; + var element = layui.element; + + // 娓叉煋鎼滅储妯℃澘 + $.ajax({ + url: baseUrl+"/docType/list/auth", + headers: {'token': localStorage.getItem('token')}, + data: { + limit: 9999 + }, + method: 'POST', + success: function (res) { + if (res.code === 200){ + let template = Handlebars.compile($('#docTypeTpl').html()); + $('#docType-query').html(template(res.data)); + layui.form.render('select'); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + } else { + layer.msg(res.msg, {icon: 2}) + } + } + }) + + // 娓叉煋琛ㄦ牸 + var insTb = table.render({ + elem: '#order', + url: baseUrl+'/orderGift/head/page/auth', + headers: {token: localStorage.getItem('token')}, + page: true, + cellMinWidth: 100, + cols: [[ + {type: 'numbers'}, + {field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'}, + {field: 'docType$', align: 'center', title: '绫诲瀷', minWidth: 160, width: 160}, + {field: 'tkType', align: 'center', title: 'TK', minWidth: 160, width: 160,hide: true}, + {align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160}, + {field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200}, + // {field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160}, + {field: 'memo', align: 'center',title: '澶囨敞', hide: true}, + {align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 240} + ]], + request: { + pageName: 'curr', + pageSize: 'limit' + }, + parseData: function (res) { + return { + 'code': res.code, + 'msg': res.msg, + 'count': res.data.total, + 'data': res.data.records + } + }, + response: { + statusCode: 200 + }, + done: function (res, curr, count) { + limit(); + if (res.code === 403) { + top.location.href = baseUrl+"/"; + } + insTbCount = count; + } + }); + + // 鎼滅储 + form.on('submit(tbSearch)', function (data) { + insTb.reload({where: data.field, page: {curr: 1}}); + }); + + //澶氭枃浠跺垪琛� + var uploadListIns = upload.render({ + elem: '#data-btn-file2' + ,elemList: $('#data-btn-file3') //鍒楄〃鍏冪礌瀵硅薄 + ,url: baseUrl+'/orderGift/insert/labelUp/file/auth' + ,accept: 'file' + ,multiple: true + ,number: 10 + ,auto: false + ,bindAction: '#testListAction' + ,choose: function(obj){ + // 璧嬪�� + this.data.orderId=$('.layui-layer-title').text() + var that = this; + var files = this.files = obj.pushFile(); //灏嗘瘡娆¢�夋嫨鐨勬枃浠惰拷鍔犲埌鏂囦欢闃熷垪 + //璇诲彇鏈湴鏂囦欢 + obj.preview(function(index, file, result){ + var tr = $(['<tr id="upload-'+ index +'">' + ,'<td>'+ file.name +'</td>' + ,'<td>'+ (file.size/1014).toFixed(1) +'kb</td>' + ,'<td><div class="layui-progress" lay-filter="progress-demo-'+ index +'"><div class="layui-progress-bar" lay-percent=""></div></div></td>' + ,'<td>' + ,'<button class="layui-btn layui-btn-xs demo-reload layui-hide">閲嶄紶</button>' + // ,'<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">鍒犻櫎</button>' + ,'</td>' + ,'</tr>'].join('')); + + //鍗曚釜閲嶄紶 + tr.find('.demo-reload').on('click', function(){ + obj.upload(index, file); + }); + + //鍒犻櫎 + tr.find('.demo-delete').on('click', function(){ + delete files[index]; //鍒犻櫎瀵瑰簲鐨勬枃浠� + tr.remove(); + uploadListIns.config.elem.next()[0].value = ''; //娓呯┖ input file 鍊硷紝浠ュ厤鍒犻櫎鍚庡嚭鐜板悓鍚嶆枃浠朵笉鍙�� + }); + + that.elemList.append(tr); + element.render('progress'); //娓叉煋鏂板姞鐨勮繘搴︽潯缁勪欢 + }); + } + ,done: function(res, index, upload){ //鎴愬姛鐨勫洖璋� + var that = this; + //if(res.code == 0){ //涓婁紶鎴愬姛 + var tr = that.elemList.find('tr#upload-'+ index) + ,tds = tr.children(); + tds.eq(3).html(''); //娓呯┖鎿嶄綔 + delete this.files[index]; //鍒犻櫎鏂囦欢闃熷垪宸茬粡涓婁紶鎴愬姛鐨勬枃浠� + return; + //} + this.error(index, upload); + } + ,allDone: function(obj){ //澶氭枃浠朵笂浼犲畬姣曞悗鐨勭姸鎬佸洖璋� + console.log(obj) + } + ,error: function(index, upload){ //閿欒鍥炶皟 + var that = this; + var tr = that.elemList.find('tr#upload-'+ index) + ,tds = tr.children(); + tds.eq(3).find('.demo-reload').removeClass('layui-hide'); //鏄剧ず閲嶄紶 + } + ,progress: function(n, elem, e, index){ //娉ㄦ剰锛歩ndex 鍙傛暟涓� layui 2.6.6 鏂板 + element.progress('progress-demo-'+ index, n + '%'); //鎵ц杩涘害鏉°�俷 鍗充负杩斿洖鐨勮繘搴︾櫨鍒嗘瘮 + } + }); + + // 娣诲姞 + $("#orderAddBtn").click(function () { + showEditModel(); + }); + + // 宸ュ叿鏉$偣鍑讳簨浠� + table.on('tool(order)', function (obj) { + var data = obj.data; + var layEvent = obj.event; + if (layEvent === 'edit') { + showEditModel(data); + } else if (layEvent === 'wrkTrace') { + showWrkTrace(data.id); + } else if (layEvent === 'del') { + doDel(data.id); + } else if (layEvent === 'labelUp') { + //涓婁紶鏍囩 + // 鎵撳紑寮圭獥 + // 鏋勫缓甯﹀弬鏁扮殑鍐呭 + layer.open({ + area: '1020px', + type: 1, + title: '涓婁紶鏂囦欢-'+data.id, + content: $('#myModal') + }); + // 鑾峰彇璺緞涓嬬殑鏂囦欢鍒楄〃锛屼娇鐢� jQuery 鐨� ajax 鏂规硶 + $.ajax({ + url: baseUrl+'/orderGift/view/labelUp/file/auth', + data:{ + orderId:data.id + }, + success: function(response) { + if (response.code==200){ + var targetTable = document.getElementById("data-btn-file3"); + targetTable.innerHTML = ''; + // 灏嗚幏鍙栧埌鐨勬枃浠跺垪琛ㄦ坊鍔犲埌鏂囦欢闃熷垪涓繘琛屾樉绀� + response.data.forEach(function(file,index) { + // 鍒涘缓tr鍏冪礌 + var tr = document.createElement("tr"); + tr.id = "upload-"+index; + tr.innerHTML = '<td>' + file.name + '</td>' + + '<td>' + (file.size / 1024).toFixed(1) + 'kb</td>' + + '<td><div class="layui-progress" lay-filter="progress-demo-' + index + '"><div class="layui-progress-bar" lay-percent=""></div></div></td>' + + '<td>' + + '<button class="layui-btn layui-btn-xs demo-reload layui-hide">閲嶄紶</button>' + // + '<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">鍒犻櫎</button>' + + '</td>'; + + // 灏唗r鍏冪礌娣诲姞鍒扮洰鏍噒able涓� + targetTable.appendChild(tr); + }); + }else { + console.log('Failed to get file list error.'); + } + }, + error: function() { + console.log('Failed to get file list.'); + } + }); + } else if (layEvent === 'refundLoc') { + //閫�搴� + pakoutPreview([data.id]); + } else if (layEvent === 'complete') { + doModify(data.id, data.orderNo, 4); + } else if (layEvent === 'look') { + var $a = $(obj.tr).find('a[lay-event="look"]'); + var offset = $a.offset(); + var top = offset.top; + var left = offset.left; + layer.open({ + type: 1, + title: false, + area: '1020px', + offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'], + shade: .01, + shadeClose: true, + fixed: false, + content: '<table id="lookSSXMTable" lay-filter="lookSSXMTable"></table>', + success: function (layero) { + table.render({ + elem: '#lookSSXMTable', + headers: {token: localStorage.getItem('token')}, + url: baseUrl+'/orderDetlGift/list/auth', + where: { + order_id: data.id + }, + page: true, + cellMinWidth: 100, + cols: [[ + {type: 'numbers'}, + {field: 'matnr', title: '瑙勬牸', width: 160}, + // {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160}, + {field: 'batch', title: '绠卞彿', width: 160}, + {field: 'model', title: '鍗峰彿', width: 160}, + // {field: 'anfme', title: '鏁伴噺'}, + {field: 'price', title: '闀垮害'}, + {field: 'weight', title: '鍑�閲�'}, + {field: 'volume', title: '姣涢噸'}, + // {field: 'workQty', title: '浣滀笟鏁伴噺'}, + + // {field: 'unit', title: '鍗曚綅'}, + // { + // field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) { + // return util.toDateString(d.createTime); + // }, width: 180 + // }, + // {field: 'inQty', title: '宸插叆搴撻噺'}, + // {field: 'color', title: '棰滆壊'}, + {field: 'specs', title: '鎺ュご', width: 70}, + // {field: 'qty$', title: '鐘舵��', style: 'font-weight: bold'}, + {field: 'source$', title: '鏄惁纭', style: 'font-weight: bold'} + ]], + request: { + pageName: 'curr', + pageSize: 'limit' + }, + parseData: function (res) { + return { + 'code': res.code, + 'msg': res.msg, + 'count': res.data.total, + 'data': res.data.records + } + }, + response: { + statusCode: 200 + }, + done: function () { + $(layero).find('.layui-table-view').css('margin', '0'); + }, + size: '' + }); + } + }); + } + }); + + // 鏄剧ず琛ㄥ崟寮圭獥 + function showEditModel(expTpe) { + admin.open({ + type: 1, + title: (expTpe ? '淇敼' : '娣诲姞') + '鍗曟嵁', + content: $('#editDialog').html(), + area: '1300px', + success: function (layero, dIndex) { + $(layero).children('.layui-layer-content').css('overflow', 'visible'); + var isExpAdd = !expTpe; + // 鍥炴樉鏁版嵁 + form.val('editForm', expTpe); + if (expTpe) { + $('#orderNo').attr("disabled", "disabled"); + } + // 琛ㄥ崟鎻愪氦浜嬩欢 + form.on('submit(orderEditSubmit)', function (data) { + // 缁勮鏁版嵁 + if (xxDataList.length <= 0) { + layer.tips('璇锋坊鍔犲崟鎹槑缁�', '#matAddBtnComment', {tips: [1, '#ff4c4c']}); + return false; + } + let nList = admin.util.deepClone(xxDataList); + for (let xi = 0; xi < nList.length; xi++) { + if (nList[xi].anfme <= 0){ + layer.msg('鏄庣粏淇敼鏁伴噺涓嶅悎娉�', {icon: 2}); + return false; + } + if (nList[xi].anfme < nList[xi].workQty){ + layer.msg('鏁伴噺涓嶈兘灏忎簬宸蹭綔涓氭暟閲�', {icon: 2}); + return false; + } + } + layer.load(2); + $.ajax({ + url: baseUrl+"/orderGift/form/" + (isExpAdd?"add":"modify") + "/auth", + headers: {'token': localStorage.getItem('token')}, + data: JSON.stringify({ + orderId: Number(data.field.id), + docType: Number(data.field.docType), + orderNo: data.field.orderNo, + orderDetlGiftList: nList + }), + contentType:'application/json;charset=UTF-8', + method: 'POST', + success: function (res) { + layer.closeAll('loading'); + if (res.code === 200){ + layer.close(dIndex); + $(".layui-laypage-btn")[0].click(); + layer.msg(res.msg, {icon: 1}); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + }else { + layer.msg(res.msg, {icon: 2}); + } + } + }) + return false; + }); + // 鏄庣粏琛ㄦ牸 + var xxDataList = []; + var tbOptions = { + elem: '#formSSXMTable', + headers: {token: localStorage.getItem('token')}, + data: xxDataList, + page: true, + height: '350px;', + cellMinWidth: 100, + cols: [[ + {type: 'numbers', title: '#'}, + {field: 'matnr', title: '瑙勬牸', width: 160}, + {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200}, + {field: 'batch', title: '绠卞彿', edit: true}, + {field: 'specs', title: '鎺ュご'}, + {field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110}, + {field: 'workQty', title: '浣滀笟鏁伴噺', minWidth: 100, width: 100}, + // {field: 'unit', title: '鍗曚綅', width: 80}, + {field: 'memo', title: '澶囨敞' , edit: true}, + {align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right'} + ]], + done: function (res) { + $(layero).find('.layui-table-view').css('margin', '0'); + }, + size: '' + }; + if (!isExpAdd) { + $.ajax({ + url: baseUrl+"/orderGift/detl/all/auth?orderId=" + expTpe.id, + headers: {'token': localStorage.getItem('token')}, + method: 'GET', + async: false, + success: function (res) { + if (res.code === 200){ + xxDataList = res.data; + tbOptions.data = xxDataList; + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + }else { + layer.msg(res.msg, {icon: 2}) + } + } + }) + } + var insTbSSXM = table.render(tbOptions); + // 宸ュ叿鏉$偣鍑讳簨浠� + table.on('tool(formSSXMTable)', function (obj) { + var data = obj.data; + var layEvent = obj.event; + if (layEvent === 'edit') { + showEditModel2(data); + } else if (layEvent === 'del') { + if(data.workQty > 0){ + layer.msg("宸插瓨鍦ㄤ綔涓氭暟閲忥紝涓嶈兘鍒犻櫎", {icon: 2}); + return; + } + layer.confirm('纭畾瑕佸垹闄ゅ悧锛�', { + shade: .1, + skin: 'layui-layer-admin' + }, function (i) { + layer.close(i); + for (var j = 0; j < xxDataList.length; j++) { + if (xxDataList[j].matnr === data.matnr && xxDataList[j].batch === data.batch) { + xxDataList.splice(j, 1); + break; + } + } + insTbSSXM.reload({data: xxDataList, page: {curr: 1}}); + }); + } + }); + // 鏄庣粏鏁版嵁淇敼 + table.on('edit(formSSXMTable)', function (obj) { + let index = obj.tr.attr("data-index"); + let data = xxDataList[index]; + if (obj.field === 'anfme'){ + let vle = Number(obj.value); + if (isNaN(vle)) { + layer.msg("璇疯緭鍏ユ暟瀛�", {icon: 2}); + return false; + } else { + if (vle <= 0) { + layer.msg("鏁伴噺蹇呴』澶т簬闆�", {icon: 2}); + // data[obj.field] = 0; + // insTbSSXM.reload({data: xxDataList}); + return false; + } + if(obj.value < data.workQty){ + layer.msg("杈撳叆鏁伴噺涓嶈兘灏忎簬浣滀笟涓暟閲�", {icon: 2}); + // data[obj.field] = 0; + // insTbSSXM.reload({data: xxDataList}); + return false; + } + } + } + data[obj.field] = obj.value; + insTbSSXM.reload({data: xxDataList}); + }); + + $('#matAddBtnComment').click(function () { + showEditModel2(); + }); + + // 鏄剧ず娣诲姞鏄庣粏琛ㄥ崟寮圭獥 + function showEditModel2(exp) { + admin.open({ + type: 1, + offset: '150px', + area: '680px', + title: (exp ? '淇敼' : '娣诲姞') + '鏄庣粏', + content: $('#matEditDialog').html(), + success: function (layero, dIndex) { + // 鍥炴樉鏁版嵁 + form.val('matEditForm', exp); + // 琛ㄥ崟鎻愪氦浜嬩欢 + form.on('submit(matEditSubmit)', function (data) { + let selectList = matXmSelect.getValue(); + for (let i = 0; i<selectList.length; i++) { + let item = selectList[i]; + // 鏌ヨ鐗╂枡璇︽儏 + $.ajax({ + url: baseUrl+"/mat/covert/"+item.value+"/auth", + headers: {'token': localStorage.getItem('token')}, + method: 'GET', + async: false, + success: function (res) { + if (res.code === 200){ + xxDataList.push(res.data); + insTbSSXM.reload({data: xxDataList, page: {curr: 1}}); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + }else { + layer.msg(res.msg, {icon: 2}) + } + } + }) + } + layer.close(dIndex); + return false; + }); + // 娓叉煋鐗╂枡閫夋嫨 + var matXmSelect = xmSelect.render({ + el: '#mat', + style: { + width: '340px', + }, + autoRow: true, + toolbar: { show: true }, + filterable: true, + remoteSearch: true, + remoteMethod: function(val, cb, show){ + $.ajax({ + url: baseUrl+"/mat/all/get/kv", + headers: {'token': localStorage.getItem('token')}, + data: { + condition: val + }, + method: 'POST', + success: function (res) { + if (res.code === 200){ + cb(res.data) + } else { + cb([]); + layer.msg(res.msg, {icon: 2}); + } + } + }); + } + }) + // 寮圭獥涓嶅嚭鐜版粴鍔ㄦ潯 + $(layero).children('.layui-layer-content').css('overflow', 'visible'); + layui.form.render('select'); + } + }); + } + + } + }); + } + + // 鍒犻櫎鍗曟嵁 + function doDel(orderId) { + layer.confirm('纭畾瑕佸垹闄ゅ悧锛�', { + shade: .1, + skin: 'layui-layer-admin' + }, function (i) { + layer.close(i); + layer.load(2); + $.ajax({ + url: baseUrl+"/orderGift/delete/auth", + headers: {'token': localStorage.getItem('token')}, + data: { + orderId: orderId + }, + method: 'POST', + success: function (res) { + layer.closeAll('loading'); + if (res.code === 200){ + if (insTbCount === 0) { + insTb.reload({page: {curr: 1}}); + } else { + $(".layui-laypage-btn")[0].click(); + } + layer.msg(res.msg, {icon: 1}); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + }else { + layer.msg(res.msg, {icon: 2}); + } + } + }) + }); + } + + // 淇敼璁㈠崟鐘舵�� + function doModify(orderId, orderNo, settle) { + layer.confirm('纭畾瑕佹墜鍔ㄥ畬缁撳悧锛�', { + shade: .1, + skin: 'layui-layer-admin' + }, function (i) { + layer.close(i); + layer.load(2); + console.log(orderId); + console.log(settle); + $.ajax({ + url: baseUrl+"/orderGift/update/auth", + headers: {'token': localStorage.getItem('token')}, + data: { + id: orderId, + orderNo: orderNo, + settle: settle + }, + method: 'POST', + success: function (res) { + layer.closeAll('loading'); + if (res.code === 200){ + if (insTbCount === 0) { + insTb.reload({page: {curr: 1}}); + } else { + $(".layui-laypage-btn")[0].click(); + } + layer.msg(res.msg, {icon: 1}); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + }else { + layer.msg(res.msg, {icon: 2}); + } + } + }) + }); + } + + // 浠诲姟杩芥函 + function showWrkTrace(orderId) { + let loadIndex = layer.msg('璇锋眰涓�...', {icon: 16, shade: 0.01, time: false}); + $.ajax({ + url: baseUrl+"/orderGift/wrk/trace/auth", + headers: {'token': localStorage.getItem('token')}, + data: { + orderId: orderId + }, + method: 'POST', + success: function (res) { + layer.close(loadIndex); + if (res.code === 200){ + laytpl(wrkTraceDialog.innerHTML).render(res.data, function (html) { + admin.open({ + type: 1, + title: '浠诲姟杩芥函', + area: ['800px', '450px'], + shadeClose: true, + content: html, + success: function (layero, dIndex) { + $(layero).children('.layui-layer-content').css('overflow', 'visible'); + /** 缁熻鍥捐〃 */ + var traceCharts = echarts.init(document.getElementById('wrkTraceCharts')); + var traceOptions = { + title: { + text: '鎬婚噺/浣滀笟/瀹屾垚', x: 'center', y: '38%', + textStyle: {fontSize: 18, color: '#262626', fontWeight: 'normal'}, + subtextStyle: {fontSize: 36, color: '#10B4E8'}, + itemGap: 20 + }, + color: ['#10B4E8', '#E0E0E0', '#FF0000'], + tooltip: {trigger: 'item'}, + series: [{name: '绠卞瓙鏁伴噺', type: 'pie', radius: ['75%', '80%'], label: {normal: {show: false}}}] + }; + traceCharts.setOption(traceOptions); + // 璧嬪�� + traceCharts.setOption({ + title: { + subtext: res.data.totalQty+"/"+res.data.wrkQty+"/"+res.data.endQty + }, + series: [ + { + data: [ + {name: '宸蹭綔涓�', value: res.data.wrkQty}, + {name: '鏈綔涓�', value: res.data.totalQty-res.data.wrkQty-res.data.lackQty}, + {name: '搴撳瓨涓嶈冻', value: res.data.lackQty}, + ] + } + ] + }); + } + }); + }); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + }else { + layer.msg(res.msg, {icon: 2}); + } + } + }) + } + + layDate.render({ + elem: '.layui-laydate-range' + ,type: 'datetime' + ,range: true + }); + + function pakoutPreview(ids) { + let loadIndex = layer.load(2); + $.ajax({ + url: baseUrl + "/outGift/refund/loc/preview/auth", + headers: {'token': localStorage.getItem('token')}, + contentType: 'application/json;charset=UTF-8', + data: JSON.stringify(ids), + method: 'POST', + success: function (res) { + layer.close(loadIndex); + var tableCache; + if (res.code === 200){ + layer.open({ + type: 1 + ,title: false + ,closeBtn: false + ,offset: '50px' + ,area: ['1500px', '700px'] + ,shade: 0.5 + ,shadeClose: false + ,btn: ['鐢熸垚閫�搴撳崟', '绋嶅悗澶勭悊'] + ,btnAlign: 'c' + ,moveType: 1 //鎷栨嫿妯″紡锛�0鎴栬��1 + ,content: $('#pakoutPreviewBox').html() + ,success: function(layero, index){ + stoPreTabIdx = table.render({ + elem: '#stoPreTab', + data: res.data, + height: 520, + page: false, + limit: Number.MAX_VALUE, + cellMinWidth: 100, + cols: [[ + {type: 'checkbox'}, + // {type: 'checkbox', merge: ['orderNo']}, + {field: 'orderNo', title: '鍗曟嵁缂栧彿', align: 'center'}, + // {field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'}, + {field: 'title', title: '鍟嗗搧', align: 'center', width: 350}, + // {field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350}, + {field: 'batch', title: '绠卞彿', align: 'center'}, + {field: 'model', title: '鍗峰彿', align: 'center', hide: false}, + {field: 'specs', title: '鎺ュご', align: 'center'}, + // {field: 'brand', title: '鏈ㄧ绫诲瀷', align: 'center'}, + {field: 'brand$', title: '鏈ㄧ绫诲瀷', align: 'center'}, + {field: 'zpallet', title: '鎵樼洏鐮�', align: 'center'}, + {field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'}, + {field: 'count', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'}, + {field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'}, + {field: 'tkType$', title: 'TK鏍囪', align: 'center', width: 100}, + // {field: 'staNos', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'}, + // {type: 'checkbox', merge: ['locNo']}, + ]], + done: function (res) { + tableMerge.render(this); + $('.layui-table-body.layui-table-main').css("overflow", "auto"); + tableCache = tableData = table.cache.stoPreTab; + } + }); + // 淇敼鍑哄簱绔� + form.on('select(tbBasicTbStaNos)', function (obj) { + let index = obj.othis.parents('tr').attr("data-index"); + let data = tableCache[index]; + for (let i = 0; i<tableCache.length; i++) { + if (tableCache[i].locNo === data.locNo) { + tableCache[i]['staNo'] = Number(obj.elem.value); + } + } + obj.othis.children().find("input").css("color", "blue"); + return false; + }); + // 鎵归噺淇敼鍑哄簱绔� + form.on('submit(batchModifySta)', function () { + let stoPreTabData = layui.table.checkStatus('stoPreTab').data; + if (stoPreTabData.length < 1) { + layer.msg("璇疯嚦灏戦�夋嫨涓�鏉′互涓婂悎骞舵暟鎹�", {icon: 7}); + return false; + } + modifySta(stoPreTabData); + }); + // 鎵归噺淇敼鍑哄簱绔� - 绔欑偣閫夋嫨 + function modifySta(stoPreTabData) { + // 鍑哄簱绔欏彇浜ら泦 + let staBatchSelectVal = []; + for(let i = 0; i<stoPreTabData.length; i++) { + let staNos = stoPreTabData[i].staNos; + if (staNos !== null) { + if (staBatchSelectVal.length === 0) { + staBatchSelectVal = staNos; + } else { + staBatchSelectVal = staBatchSelectVal.filter(val => + { + return new Set(staNos).has(val) + } + ) + } + } + } + if (staBatchSelectVal.length === 0) { + layer.msg("鍑哄簱绔欐病鏈変氦闆嗭紝鏃犳硶鎵归噺淇敼", {icon: 2}); + return; + } + admin.open({ + type: 1, + area: '300px', + offset: 'auto', + title: '璇烽�夋嫨绔欑偣', + content: $('#staBatchSelectDialog').html(), + success: function (layero, ddIndex) { + // 娓叉煋涓嬫媺妗� + let template = Handlebars.compile($('#batchStaSelectTpl').html()); + $('#batchSelectStaBox').html(template({list: staBatchSelectVal})); + // 纭 + form.on('submit(staBatchSelectConfirm)', function (obj) { + let loadIdx = layer.load(2); + let batchSta = Number(obj.field.batchSta); + let arr = []; + for (let j = 0; j<stoPreTabData.length; j++) { + for (let i = 0; i<tableCache.length; i++) { + if (tableCache[i].orderNo === stoPreTabData[j].orderNo + && tableCache[i].matnr === stoPreTabData[j].matnr + && tableCache[i].locNo === stoPreTabData[j].locNo) { + tableCache[i]['staNo'] = batchSta; + arr.push(i); + } + } + } + stoPreTabIdx.reload({data: tableCache}); + arr.forEach(item => { + $('div[lay-id=stoPreTab] tr[data-index="' + item + '"] .order-sta-select').val(batchSta); + }); + layui.form.render('select'); + arr.forEach(item => { + $('div[lay-id=stoPreTab] tr[data-index="' + item + '"] .layui-select-title').find("input").css("color", "blue"); + }); + layer.close(loadIdx); layer.close(ddIndex); + return false; + }); + // 寮圭獥涓嶅嚭鐜版粴鍔ㄦ潯 + $(layero).children('.layui-layer-content').css('overflow', 'visible'); + layui.form.render('select'); + }, + }) + } + + } + ,yes: function(index, layero){ + //鎸夐挳銆愰��搴撱�戠殑鍥炶皟 + pakout(tableCache2, index); + tableCache2 = [] + } + ,btn2: function(index, layero){ + //鎸夐挳銆愮◢鍚庡鐞嗐�戠殑鍥炶皟 + layer.close(index) + tableCache2 = [] + //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴 + } + }); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + } else { + layer.msg(res.msg, {icon: 2}) + } + } + }) + + // 澶嶉�夋浜嬩欢 + table.on('checkbox(stoPreTab)', function(obj){ + tableCache2.push(obj.data) + }); + } + + function pakout(tableCache, layerIndex) { + // let loadIndex = layer.load(2); + notice.msg('姝e湪鐢熸垚鍑哄簱浠诲姟......', {icon: 4}); + $.ajax({ + url: baseUrl + "/outGift/refund/loc/auth", + headers: {'token': localStorage.getItem('token')}, + contentType: 'application/json;charset=UTF-8', + data: JSON.stringify(tableCache), + method: 'POST', + success: function (res) { + notice.destroy(); + if (res.code === 200) { + layer.close(layerIndex); + layer.msg(res.msg, {icon: 1}); + insTb.reload({where: null}); + insTb2.reload({where: null, page: {curr: 1}}); + } else if (res.code === 403) { + top.location.href = baseUrl + "/"; + } else { + layer.msg(res.msg, {icon: 2}) + } + } + }); + } +}); diff --git a/src/main/webapp/static/js/orderGift/outGift.js b/src/main/webapp/static/js/orderGift/outGift.js new file mode 100644 index 0000000..1ec550c --- /dev/null +++ b/src/main/webapp/static/js/orderGift/outGift.js @@ -0,0 +1,390 @@ +var pageCurr; +var insTb2; +layui.config({ + base: baseUrl + "/static/layui/lay/modules/" +}).extend({ + notice: 'notice/notice', +}).use(['table','laydate', 'form', 'util', 'admin', 'notice', 'treeTable', 'xmSelect', 'tableMerge', 'tableX'], function(){ + var table = layui.table; + var $ = layui.jquery; + var layer = layui.layer; + var layDate = layui.laydate; + var form = layui.form; + var admin = layui.admin; + var util = layui.util; + var notice = layui.notice; + var treeTable = layui.treeTable; + var xmSelect = layui.xmSelect; + var tableMerge = layui.tableMerge; + var tableX = layui.tableX; + + insTb2 = table.render({ + elem: '#orderDetlTable', + headers: {token: localStorage.getItem('token')}, + url: baseUrl+'/orderDetl/pakout/list/auth', + page: true, + limit: 15, + limits: [15, 30, 50, 100, 200, 500], + toolbar: '#orderDetToolbar', + height: 'full-120', + where: {order_id: 9999999999}, + cols: [[ + {type: 'checkbox'} + ,{type: 'numbers', title: '#'} + ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160} + ,{field: 'matnr', align: 'center',title: '瑙勬牸', width: 160} + ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200} + ,{field: 'batch', align: 'center',title: '绠卞彿'} + ,{field: 'specs', align: 'center',title: '鎺ュご'} + // ,{field: 'anfme', align: 'center',title: '鏁伴噺'} + // ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'} + ,{field: 'enableQty', align: 'center',title: '寰呭嚭鏁伴噺', style: 'font-weight: bold'} + // ,{field: 'name', align: 'center',title: '鍚嶇О'} + ,{field: 'model', align: 'center',title: '鍗峰彿', hide: false} + ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true} + ,{field: 'barcode', align: 'center',title: '鍟嗗搧鏉$爜', hide: true} + // ,{field: 'supplier', align: 'center',title: '渚涘簲鍟�'} + // ,{field: 'unitPrice', align: 'center',title: '鍗曚环'} + // ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�'} + // ,{field: 'count', align: 'center',title: '鏁伴噺'} + // ,{field: 'weight', align: 'center',title: '閲嶉噺'} + // ,{field: 'status$', align: 'center',title: '鐘舵��'} + // ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'} + // ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'} + // ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'} + // ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'} + // ,{field: 'memo', align: 'center',title: '澶囨敞'} + ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 160} + ]], + request: { + pageName: 'curr', + pageSize: 'limit' + }, + parseData: function (res) { + return { + 'code': res.code, + 'msg': res.msg, + 'count': res.data.total, + 'data': res.data.records + } + }, + response: { + statusCode: 200 + }, + done: function(res, curr, count) { + if (res.code === 403) { + top.location.href = baseUrl+"/"; + } + pageCurr=curr; + limit(); + } + }); + + /* 琛ㄦ牸2鎼滅储 */ + form.on('submit(sensorTbSearch)', function (data) { + insTb2.reload({where: data.field, page: {curr: 1}}); + return false; + }); + + /* 琛ㄦ牸2澶村伐鍏锋爮鐐瑰嚮浜嬩欢 */ + table.on('toolbar(orderDetlTable)', function (obj) { + + var checkStatus = table.checkStatus(obj.config.id).data; + if (obj.event === 'pakoutPreview') { // 娣诲姞 + if (checkStatus.length === 0) { + layer.msg('璇烽�夋嫨鑷冲皯涓�鏉″嚭搴撴槑缁�', {icon: 2}); + return; + } + pakoutPreview(checkStatus.map(function (d) { + return d.id; + })); + } else if (obj.event === 'del') { // 鍒犻櫎 + var checkRows = table.checkStatus('sensorTable'); + if (checkRows.data.length === 0) { + layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2}); + return; + } + var ids = checkRows.data.map(function (d) { + return d.id; + }); + doDelSensor({ids: ids}); + } + }); + + /* 琛ㄦ牸2宸ュ叿鏉$偣鍑讳簨浠� */ + table.on('tool(orderDetlTable)', function (obj) { + console.log(obj); + var data = obj.data; + switch (obj.event) { + // 鍑哄簱 + case 'pakoutPreview': + pakoutPreview([data.id]) + break; + } + }); + + function pakoutPreview(ids) { + let loadIndex = layer.load(2); + $.ajax({ + url: baseUrl + "/out/pakout/preview/auth", + headers: {'token': localStorage.getItem('token')}, + contentType: 'application/json;charset=UTF-8', + data: JSON.stringify(ids), + method: 'POST', + success: function (res) { + layer.close(loadIndex); + var tableCache; + if (res.code === 200){ + layer.open({ + type: 1 + ,title: false + ,closeBtn: false + ,offset: '50px' + ,area: ['1500px', '700px'] + ,shade: 0.5 + ,shadeClose: false + ,btn: ['绔嬪嵆鍑哄簱', '绋嶅悗澶勭悊'] + ,btnAlign: 'c' + ,moveType: 1 //鎷栨嫿妯″紡锛�0鎴栬��1 + ,content: $('#pakoutPreviewBox').html() + ,success: function(layero, index){ + stoPreTabIdx = table.render({ + elem: '#stoPreTab', + data: res.data, + height: 520, + page: false, + limit: Number.MAX_VALUE, + cellMinWidth: 100, + cols: [[ + // {type: 'checkbox', merge: ['orderNo']}, + {field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'}, + {field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350}, + {field: 'batch', title: '绠卞彿', align: 'center'}, + {field: 'model', title: '鍗峰彿', align: 'center', hide: false}, + {field: 'specs', title: '鎺ュご', align: 'center'}, + {field: 'brand', align: 'center',title: '鏈ㄧ绫诲瀷', hide: true}, + {field: 'brand$', align: 'center',title: '鏈ㄧ绫诲瀷', hide: false}, + {field: 'zpallet', title: '鎵樼洏鐮�', align: 'center'}, + {field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'}, + {field: 'count', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'}, + {field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'}, + // {field: 'staNos', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'}, + // {type: 'checkbox', merge: ['locNo']}, + ]], + done: function (res) { + tableMerge.render(this); + $('.layui-table-body.layui-table-main').css("overflow", "auto"); + tableCache = tableData = table.cache.stoPreTab; + } + }); + // 淇敼鍑哄簱绔� + form.on('select(tbBasicTbStaNos)', function (obj) { + let index = obj.othis.parents('tr').attr("data-index"); + let data = tableCache[index]; + for (let i = 0; i<tableCache.length; i++) { + if (tableCache[i].locNo === data.locNo) { + tableCache[i]['staNo'] = Number(obj.elem.value); + } + } + obj.othis.children().find("input").css("color", "blue"); + return false; + }); + // 鎵归噺淇敼鍑哄簱绔� + form.on('submit(batchModifySta)', function () { + let stoPreTabData = layui.table.checkStatus('stoPreTab').data; + if (stoPreTabData.length < 1) { + layer.msg("璇疯嚦灏戦�夋嫨涓�鏉′互涓婂悎骞舵暟鎹�", {icon: 7}); + return false; + } + modifySta(stoPreTabData); + }); + // 鎵归噺淇敼鍑哄簱绔� - 绔欑偣閫夋嫨 + function modifySta(stoPreTabData) { + // 鍑哄簱绔欏彇浜ら泦 + let staBatchSelectVal = []; + for(let i = 0; i<stoPreTabData.length; i++) { + let staNos = stoPreTabData[i].staNos; + if (staNos !== null) { + if (staBatchSelectVal.length === 0) { + staBatchSelectVal = staNos; + } else { + staBatchSelectVal = staBatchSelectVal.filter(val => + { + return new Set(staNos).has(val) + } + ) + } + } + } + if (staBatchSelectVal.length === 0) { + layer.msg("鍑哄簱绔欐病鏈変氦闆嗭紝鏃犳硶鎵归噺淇敼", {icon: 2}); + return; + } + admin.open({ + type: 1, + area: '300px', + offset: 'auto', + title: '璇烽�夋嫨绔欑偣', + content: $('#staBatchSelectDialog').html(), + success: function (layero, ddIndex) { + // 娓叉煋涓嬫媺妗� + let template = Handlebars.compile($('#batchStaSelectTpl').html()); + $('#batchSelectStaBox').html(template({list: staBatchSelectVal})); + // 纭 + form.on('submit(staBatchSelectConfirm)', function (obj) { + let loadIdx = layer.load(2); + let batchSta = Number(obj.field.batchSta); + let arr = []; + for (let j = 0; j<stoPreTabData.length; j++) { + for (let i = 0; i<tableCache.length; i++) { + if (tableCache[i].orderNo === stoPreTabData[j].orderNo + && tableCache[i].matnr === stoPreTabData[j].matnr + && tableCache[i].locNo === stoPreTabData[j].locNo) { + tableCache[i]['staNo'] = batchSta; + arr.push(i); + } + } + } + stoPreTabIdx.reload({data: tableCache}); + arr.forEach(item => { + $('div[lay-id=stoPreTab] tr[data-index="' + item + '"] .order-sta-select').val(batchSta); + }); + layui.form.render('select'); + arr.forEach(item => { + $('div[lay-id=stoPreTab] tr[data-index="' + item + '"] .layui-select-title').find("input").css("color", "blue"); + }); + layer.close(loadIdx); layer.close(ddIndex); + return false; + }); + // 寮圭獥涓嶅嚭鐜版粴鍔ㄦ潯 + $(layero).children('.layui-layer-content').css('overflow', 'visible'); + layui.form.render('select'); + }, + }) + } + + } + ,yes: function(index, layero){ + //鎸夐挳銆愮珛鍗冲嚭搴撱�戠殑鍥炶皟 + pakout(tableCache, index); + } + ,btn2: function(index, layero){ + //鎸夐挳銆愮◢鍚庡鐞嗐�戠殑鍥炶皟 + layer.close(index) + //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴 + } + }); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + } else { + layer.msg(res.msg, {icon: 2}) + } + } + }) + } + + function pakout(tableCache, layerIndex) { + // let loadIndex = layer.load(2); + notice.msg('姝e湪鐢熸垚鍑哄簱浠诲姟......', {icon: 4}); + $.ajax({ + url: baseUrl + "/out/pakout/auth", + headers: {'token': localStorage.getItem('token')}, + contentType: 'application/json;charset=UTF-8', + data: JSON.stringify(tableCache), + method: 'POST', + success: function (res) { + notice.destroy(); + if (res.code === 200) { + layer.close(layerIndex); + layer.msg(res.msg, {icon: 1}); + insTb.reload({where: null}); + insTb2.reload({where: null, page: {curr: 1}}); + } else if (res.code === 403) { + top.location.href = baseUrl + "/"; + } else { + layer.msg(res.msg, {icon: 2}) + } + } + }); + } + + + + /* 鍒犻櫎璁㈠崟 */ + function doDelSensor(obj) { + layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', { + skin: 'layui-layer-admin', + shade: .1 + }, function (i) { + layer.close(i); + var loadIndex = layer.load(2); + $.ajax({ + url: baseUrl+"/sensor/delete/auth", + headers: {'token': localStorage.getItem('token')}, + data: {ids: obj.ids}, + method: 'POST', + success: function (res) { + layer.close(loadIndex); + if (res.code === 200){ + layer.msg(res.msg, {icon: 1}); + $(".layui-laypage-btn")[0].click(); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + }else { + layer.msg(res.msg, {icon: 2}); + } + } + }) + + }); + } + + // 淇敼鐘舵�� + form.on('switch(statusSwitch)', function (obj) { + var index = obj.othis.parents('tr').attr("data-index"); + var data = tableData[index]; + data[this.name] = obj.elem.checked?1:0; + http.post(baseUrl+"/sensor/edit/auth", {id: data.id, status: data[this.name]}, function (res) { + layer.msg(res.msg, {icon: 1}); + }) + }) + + window.pakoutPreview = pakoutPreview; + +}); + +function tableReload(child) { + var searchData = {}; + $.each($('#search-box [name]').serializeArray(), function() { + searchData[this.name] = this.value; + }); + (child ? parent.tableIns : tableIns).reload({ + where: searchData, + page: { + curr: pageCurr + } + }); +} + +/** + * 涓�閿嚭搴� + */ +function autoOut(orderId) { + let loadIndex = layer.msg('璇锋眰涓�...', {icon: 16, shade: 0.01, time: false}); + $.ajax({ + url: baseUrl + "/out/pakout/orderDetlIds/auth", + headers: {'token': localStorage.getItem('token')}, + data: { orderId : orderId }, + method: 'POST', + success: function (res) { + layer.close(loadIndex); + if (res.code === 200){ + pakoutPreview(res.data); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + } else { + layer.msg(res.msg, {icon: 2}); + } + } + }) +} diff --git a/src/main/webapp/views/orderDetlGift/orderDetlGift.html b/src/main/webapp/views/orderDetlGift/orderDetlGift.html new file mode 100644 index 0000000..b7dcce0 --- /dev/null +++ b/src/main/webapp/views/orderDetlGift/orderDetlGift.html @@ -0,0 +1,225 @@ +<!DOCTYPE html> +<html lang="en"> +<head> + <meta charset="utf-8"> + <title></title> + <meta name="renderer" content="webkit"> + <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> + <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> + <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all"> + <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all"> + <link rel="stylesheet" href="../../static/css/cool.css" media="all"> +</head> +<body> + +<div class="layui-fluid"> + <div class="layui-card"> + <div class="layui-card-body"> + <div class="layui-form toolbar" id="search-box"> + <div class="layui-form-item"> + <div class="layui-inline"> + <label class="layui-form-label">缂栧彿:</label> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off"> + </div> + </div> + <div class="layui-inline">  + <button class="layui-btn icon-btn" lay-filter="search" lay-submit> + <i class="layui-icon"></i>鎼滅储 + </button> + <button class="layui-btn icon-btn" lay-filter="reset" lay-submit> + <i class="layui-icon"></i>閲嶇疆 + </button> + </div> + </div> + </div> + <table class="layui-hide" id="orderDetl" lay-filter="orderDetl"></table> + </div> + </div> +</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 layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button> + <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button> + </div> +</script> + +<script type="text/html" id="operate"> + <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a> + <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a> +</script> + +<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script> +<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/orderDetlGift/orderDetlGift.js" charset="utf-8"></script> +</body> +<!-- 琛ㄥ崟寮圭獥 --> +<script type="text/html" id="editDialog"> + <form id="detail" lay-filter="detail" class="layui-form admin-form model-form"> + <input name="id" type="hidden"> + <div class="layui-row"> + <div class="layui-col-md12"> + <div class="layui-form-item"> + <label class="layui-form-label">璁㈠崟鍐呯爜: </label> + <div class="layui-input-block cool-auto-complete"> + <input class="layui-input" name="orderId" placeholder="璇疯緭鍏ヨ鍗曞唴鐮�" style="display: none"> + <input id="orderId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヨ鍗曞唴鐮�" onfocus=this.blur()> + <div class="cool-auto-complete-window"> + <input class="cool-auto-complete-window-input" data-key="orderQueryByorderId" onkeyup="autoLoad(this.getAttribute('data-key'))"> + <select class="cool-auto-complete-window-select" data-key="orderQueryByorderIdSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> + </select> + </div> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鏁伴噺: </label> + <div class="layui-input-block"> + <input class="layui-input" name="anfme" placeholder="璇疯緭鍏ユ暟閲�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鍟嗗搧缂栫爜: </label> + <div class="layui-input-block"> + <input class="layui-input" name="matnr" placeholder="璇疯緭鍏ュ晢鍝佺紪鐮�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鍟嗗搧鍚嶇О: </label> + <div class="layui-input-block"> + <input class="layui-input" name="maktx" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鍚嶇О: </label> + <div class="layui-input-block"> + <input class="layui-input" name="name" placeholder="璇疯緭鍏ュ悕绉�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">瑙勬牸: </label> + <div class="layui-input-block"> + <input class="layui-input" name="specs" placeholder="璇疯緭鍏ユ帴澶�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鍨嬪彿: </label> + <div class="layui-input-block"> + <input class="layui-input" name="model" placeholder="璇疯緭鍏ュ瀷鍙�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鎵瑰彿: </label> + <div class="layui-input-block"> + <input class="layui-input" name="batch" placeholder="璇疯緭鍏ユ壒鍙�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鍗曚綅: </label> + <div class="layui-input-block"> + <input class="layui-input" name="unit" placeholder="璇疯緭鍏ュ崟浣�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鍟嗗搧鏉$爜: </label> + <div class="layui-input-block"> + <input class="layui-input" name="barcode" placeholder="璇疯緭鍏ュ晢鍝佹潯鐮�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">渚涘簲鍟�: </label> + <div class="layui-input-block"> + <input class="layui-input" name="supplier" placeholder="璇疯緭鍏ヤ緵搴斿晢"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鍗曚环: </label> + <div class="layui-input-block"> + <input class="layui-input" name="unitPrice" placeholder="璇疯緭鍏ュ崟浠�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鍝侀」鏁�: </label> + <div class="layui-input-block"> + <input class="layui-input" name="itemNum" placeholder="璇疯緭鍏ュ搧椤规暟"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鏁伴噺: </label> + <div class="layui-input-block"> + <input class="layui-input" name="count" placeholder="璇疯緭鍏ユ暟閲�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">閲嶉噺: </label> + <div class="layui-input-block"> + <input class="layui-input" name="weight" placeholder="璇疯緭鍏ラ噸閲�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鐘舵��: </label> + <div class="layui-input-block"> + <select name="status"> + <option value="">璇烽�夋嫨鐘舵��</option> + <option value="1">姝e父</option> + <option value="0">绂佺敤</option> + </select> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">娣诲姞浜哄憳: </label> + <div class="layui-input-block cool-auto-complete"> + <input class="layui-input" name="createBy" placeholder="璇疯緭鍏ユ坊鍔犱汉鍛�" style="display: none"> + <input id="createBy$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ユ坊鍔犱汉鍛�" onfocus=this.blur()> + <div class="cool-auto-complete-window"> + <input class="cool-auto-complete-window-input" data-key="userQueryBycreateBy" onkeyup="autoLoad(this.getAttribute('data-key'))"> + <select class="cool-auto-complete-window-select" data-key="userQueryBycreateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> + </select> + </div> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">娣诲姞鏃堕棿: </label> + <div class="layui-input-block"> + <input class="layui-input" name="createTime" id="createTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">淇敼浜哄憳: </label> + <div class="layui-input-block cool-auto-complete"> + <input class="layui-input" name="updateBy" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none"> + <input id="updateBy$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" onfocus=this.blur()> + <div class="cool-auto-complete-window"> + <input class="cool-auto-complete-window-input" data-key="userQueryByupdateBy" onkeyup="autoLoad(this.getAttribute('data-key'))"> + <select class="cool-auto-complete-window-select" data-key="userQueryByupdateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> + </select> + </div> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">淇敼鏃堕棿: </label> + <div class="layui-input-block"> + <input class="layui-input" name="updateTime" id="updateTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">澶囨敞: </label> + <div class="layui-input-block"> + <input class="layui-input" name="memo" placeholder="璇疯緭鍏ュ娉�"> + </div> + </div> + + </div> + </div> + <hr class="layui-bg-gray"> + <div class="layui-form-item text-right"> + <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button> + <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button> + </div> + </form> +</script> +</html> + diff --git a/src/main/webapp/views/orderGift/orderGift.html b/src/main/webapp/views/orderGift/orderGift.html new file mode 100644 index 0000000..b31aaf3 --- /dev/null +++ b/src/main/webapp/views/orderGift/orderGift.html @@ -0,0 +1,382 @@ +<!DOCTYPE html> +<html lang="en"> +<head> + <meta charset="utf-8"> + <title></title> + <meta name="renderer" content="webkit"> + <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> + <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> + <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all"> + <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all"> + <link rel="stylesheet" href="../../static/css/cool.css" media="all"> + <link rel="stylesheet" href="../../static/css/originTable.css" media="all"> + <!-- <link rel="stylesheet" href="../../static/css/common.css" media="all">--> + <!--[if lt IE 9]> + <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script> + <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> + <![endif]--> + <style> + .wrk-trace { + color: green; + cursor: pointer; + margin-left: 6px; + font-size: 18px; + } + + .layui-timeline:first-child .layui-timeline-item { + margin-top: 30px; + } + .btn-add { + display: none; + } + .btn-edit { + display: none; + } + .btn-complete { + display: none; + } + .btn-delete { + display: none; + } + </style> +</head> +<body> + +<!-- 姝f枃寮�濮� --> +<div class="layui-fluid"> + <div class="layui-card"> + <div class="layui-card-body"> + <!-- 琛ㄦ牸椤堕儴宸ュ叿鏍� --> + <div class="layui-form toolbar"> + <div class="layui-form-item"> + <div class="layui-inline"> + <div class="layui-input-inline mr0"> + <input name="order_no" class="layui-input" type="text" placeholder="杈撳叆鍗曟嵁缂栧彿"/> + </div> + </div> + <div class="layui-inline" style="width: 300px"> + <div class="layui-input-inline"> + <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px"> + </div> + </div> + <div class="layui-inline"> + <div class="layui-input-inline"> + <select name="doc_type" id="docType-query"> + </select> + </div> + </div> + <div class="layui-inline"> + <div class="layui-input-inline"> + <select name="settle"> + <option value="">閫夋嫨鐘舵��</option> + <option value="1">寰呭鐞�</option> + <option value="2">浣滀笟涓�</option> + <option value="4">宸插畬鎴�</option> + <option value="6">涓婃姤瀹屾垚</option> + </select> + </div> + </div> + <div class="layui-inline"> + <button class="layui-btn icon-btn" lay-filter="tbSearch" lay-submit> + <i class="layui-icon"></i>鎼滅储 + </button> +<!-- <button id="orderAddBtn" class="layui-btn icon-btn btn-add"><i class="layui-icon"></i>娣诲姞--> +<!-- </button>--> + </div> + </div> + </div> + <table id="order" lay-filter="order"></table> + </div> + </div> + <div class="layui-card"> + <div class="layui-card-body"> +<!-- 鍏ュ簱閫氱煡鍗曪細鐢盓RP鎻愪緵鍗曟嵁缂栧彿銆佺被鍨嬨�佸崟鎹椂闂村強鐗╂枡鏄庣粏锛岀敓鎴愬叆搴撲綔涓氬崟锛屼负缁存姢绯荤粺楂樺彲鐢紝鐢ㄦ埛鍙嚜琛屾坊鍔犲叆搴撻�氱煡鍗曟暟鎹紝瀹屾垚鐙珛鐨勫叆搴撲綔涓氥��--> +<!-- <span class="text-danger">鎵嬪姩娣诲姞鏃讹紝璇锋鏌ュ崟鎹紪鍙锋槸鍚﹀湪ERP绯荤粺涓凡瀛樺湪锛岄伩鍏嶅彂鐢熸暟鎹敊璇棶棰樸��</span>--> + <span class="text-danger">鍑哄簱鏃讹紝璇锋鏌ュ崟鎹紪鍙锋槸鍚﹀湪绯荤粺涓凡瀛樺湪锛岄伩鍏嶅彂鐢熸暟鎹敊璇棶棰樸��</span> + </div> + </div> +</div> + +<div id="myModal" style="display: none"> + <div style="padding: 10px"> + <div class="layui-upload"> + <button type="button" class="layui-btn layui-btn-normal" id="data-btn-file2">閫夋嫨鏂囦欢</button><input id="data-btn-upload" class="layui-upload-file" type="file" accept="" name="file" multiple=""> + <div class="layui-upload-list" style="max-width: 1000px;height:400px;overflow: scroll"> + <table class="layui-table"> + <colgroup> + <col> + <col width="150"> + <col width="260"> + <col width="150"> + </colgroup> + <thead> + <tr><th>鏂囦欢鍚�</th> + <th>澶у皬</th> + <th>涓婁紶杩涘害</th> + <th>鎿嶄綔</th> + </tr></thead> + <tbody id="data-btn-file3"></tbody> + </table> + </div> + <button type="button" class="layui-btn" id="testListAction">寮�濮嬩笂浼�</button> + </div> + </div> +</div> +<!-- 琛ㄦ牸鎿嶄綔鍒� --> +<script type="text/html" id="operate"> + {{# if (d.settle == 0 || d.settle == 1) { }} + <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a> + {{# } }} + {{# if (d.settle == 0 || d.settle == 1 || d.settle == 2) { }} + <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">瀹岀粨</a> + {{# } }} +</script> +<!-- 琛ㄦ牸鎿嶄綔鍒� --> +<script type="text/html" id="tbLook"> + <span class="layui-text"> + <a href="javascript:;" lay-event="look"> + <i class="layui-icon" style="font-size: 12px;"></i> 鏌ョ湅鍗曟嵁鏄庣粏 + </a> + </span> +</script> +<script type="text/html" id="orderNoTpl"> + {{d.orderNo}} + {{# if(d.settle > 1 && d.settle !== 3){ }} + + {{# } }} + <i class="layui-icon layui-icon-about wrk-trace" lay-tips="鏌ョ湅浠诲姟杩芥函" lay-direction="2" lay-offset="-10px,0px" lay-event="wrkTrace"></i> +</script> + +<!--<script type="text/html" id="settleTpl">--> +<!-- <span name="settle" class="layui-badge layui-badge-gray">{{d.settle$}}</span>--> +<!--</script>--> +<script type="text/html" id="settleTpl"> + <span name="settle" + {{# if( d.settle === 1){ }} + class="layui-badge layui-badge-red" + {{# }else if(d.settle === 2){ }} + class="layui-badge layui-badge-green" + {{# }else if(d.settle === 3){ }} + class="layui-badge layui-badge-gray" + {{# }else if(d.settle === 4){ }} + class="layui-badge layui-badge-blue" + {{# }else if(d.settle === 5){ }} + class="layui-badge layui-badge-gray" + {{# }else if(d.settle === 6){ }} + class="layui-badge layui-badge-gray" + {{# } }} + >{{d.settle$}}</span> +</script> +<!-- 琛ㄥ崟寮圭獥 --> +<script type="text/html" id="editDialog"> + <form id="editForm" lay-filter="editForm" class="layui-form model-form"> + <input name="id" type="hidden"/> + <div class="layui-form-item"> + <label class="layui-form-label">鍗曟嵁绫诲瀷锛�</label> + <div class="layui-input-block cool-auto-complete"> + <input class="layui-input" name="docType" placeholder="璇疯緭鍏ュ崟鎹被鍨�" style="display: none"> + <input id="docType$" name="docType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ崟鎹被鍨�" onfocus=this.blur() lay-verType="tips" lay-verify="required"> + <div class="cool-auto-complete-window"> + <input class="cool-auto-complete-window-input" data-key="docTypeQueryBydocType" onkeyup="autoLoad(this.getAttribute('data-key'))"> + <select class="cool-auto-complete-window-select" data-key="docTypeQueryBydocTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> + </select> + </div> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鍗曟嵁缂栧彿锛�</label> + <div class="layui-input-block"> + <input id="orderNo" name="orderNo" placeholder="杈撳叆鍗曟嵁缂栧彿" type="text" class="layui-input" maxlength="20" lay-verType="tips" /> +<!-- lay-verify="required"--> + </div> + </div> + <div class="layui-form-item" style="position: relative;"> + <label class="layui-form-label">鍗曟嵁鏄庣粏锛�</label> + <div class="layui-input-block"> + <table id="formSSXMTable" lay-filter="formSSXMTable"></table> + </div> + <button class="layui-btn layui-btn-sm icon-btn" id="matAddBtnComment" + style="position: absolute; left: 20px;top: 60px;padding: 0 5px;" type="button"> + <i class="layui-icon"></i>娣诲姞鏄庣粏 + </button> + </div> + <div class="layui-form-item text-right"> + <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button> + <button class="layui-btn" lay-filter="orderEditSubmit" lay-submit>淇濆瓨</button> + </div> + </form> +</script> +<!-- 琛ㄦ牸鎿嶄綔鍒� --> +<script type="text/html" id="formSSXMTableBar"> + <!-- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">淇敼</a>--> + <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a> +</script> +<!-- 琛ㄥ崟寮圭獥 --> +<script type="text/html" id="matEditDialog"> + <form id="matEditForm" lay-filter="matEditForm" class="layui-form model-form"> + <input name="experimentId" type="hidden"/> + <div class="layui-form-item" style="float: left"> + <label class="layui-form-label">鐗╂枡 - 澶氶��</label> + <div class="layui-input-block"> + <div id="mat" name="mat"> + </div> + </div> + </div> + <div class="layui-form-item text-right" style="display: inline-block; margin-left: 35px"> + <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button> + <button class="layui-btn" lay-filter="matEditSubmit" lay-submit>淇濆瓨</button> + </div> + </form> +</script> +<!-- 璁㈠崟浠诲姟杩芥函 --> +<script id="wrkTraceDialog" type="text/html" style="position: relative"> + <div style="position: absolute; top: 0; left: 0;"> + <div class="layui-card" style="overflow: hidden;"> + <div class="layui-card-header" style="text-align: center;width: 80%;font-weight: inherit;font-size: 18px">{{ d.orderNo }}</div> + <div class="layui-card-body"> + <div id="wrkTraceCharts" style="height: 300px;width: 400px;transform: translateX(-10%);"></div> + </div> + </div> + </div> + <div class="layui-row" > + <div class="layui-col-md5"> + <h1 style="opacity: 0;">Hello World</h1> + </div> + <div class="layui-col-md7" style=""> + {{# if(d.list.length > 0){ }} + <ul class="layui-timeline" style="height: 400px; overflow: scroll;"> + {{# layui.each(d.list, function(index, item){ }} + <li class="layui-timeline-item"> + <i class="layui-icon layui-timeline-axis"></i> + <div class="layui-timeline-content layui-text"> + <div class="layui-timeline-title"> + <h3 class="inline-block"> + {{ item.wrkNo }} + + {{# if(item.wrkMast.ioType < 100){ }} + <span class="layui-badge layui-bg-blue" style="line-height: 20px;"> + {{ item.wrkMast.ioType$ }} + </span> + {{# } }} + + {{# if(item.wrkMast.ioType > 100){ }} + <span class="layui-badge layui-bg-orange" style="line-height: 20px;"> + {{ item.wrkMast.ioType$ }} + </span> + {{# } }} + + + {{# if(item.wrkMast.wrkSts < 14){ }} + <span class="layui-badge layui-bg-red" style="line-height: 20px;"> + {{ item.wrkMast.wrkSts$ }} + </span> + {{# } }} + + {{# if(item.wrkMast.wrkSts >= 14){ }} + <span class="layui-badge layui-bg-green" style="line-height: 20px;"> + {{ item.wrkMast.wrkSts$ }} + </span> + {{# } }} + + </h3>  + {{ item.wrkMast.ioTime$ }} + </div> + + <table class="layui-table" lay-skin="nob" style="width: 80%"> + <thead> + <tr style="background: none"> + <td>No.</td> + <td>瑙勬牸</td> + <!-- <td>瑙勬牸</td>--> + <td>绠卞彿</td> +<!-- <td>绠卞瓙绫诲瀷</td>--> + <td>鏄惁纭</td> + </tr> + </thead> + <tbody> + {{# layui.each(item.wrkDetls, function(idx, wrkDetl){ }} + <tr> + <td><span class="layui-badge layui-bg-cyan">{{ idx+1 }}</span></td> + <td>{{ wrkDetl.matnr }}</td> + <!-- <td>{{ wrkDetl.specs }}</td>--> + <td style="font-weight: bold">{{ wrkDetl.batch }}</td> + <td style="font-weight: bold">{{ wrkDetl.source$ }}</td> + </tr> + {{# }); }} + </tbody> + </table> + + <hr class="layui-border-cyan" style="width: 90%; opacity: .6;"> + </div> + </li> + {{# }); }} + </ul> + {{# } else { }} + <div style="height: 350px;display: flex;justify-content: center;align-items: center;"> + <h2 style="font-weight: bold;letter-spacing: 2px">鏆傛棤浠诲姟</h2> + </div> + {{# } }} + </div> + </div> + + +</script> + +<!-- 鍑哄簱棰勮 --> +<script type="text/html" id="pakoutPreviewBox" style="display: none"> + <div style="padding: 25px; line-height: 22px; background-color: #393D49; color: #fff; font-weight: 300;"> + <span style="font-size: large; font-weight: bold">閫�搴�</span> + </div> + <div class="layui-card"> + <div class="layui-card-body" style="padding: 10px"> + <table id="stoPreTab" lay-filter="stoPreTab"></table> + </div> + <button class="layui-btn layui-btn-primary layui-border-black layui-btn-sm" lay-filter="batchModifySta" lay-submit style="display: block;float: right;margin-right: 1rem"> + 鎵归噺淇敼 + </button> + </div> +</script> + +<script type="text/html" id="staBatchSelectDialog"> + <form class="layui-form" style="padding: 25px 50px 30px 50px;text-align: center"> + <select id="batchSelectStaBox" name="batchSta" lay-vertype="tips" lay-verify="required" required=""> + </select> + <button style="margin-top: 30px" class="layui-btn" lay-filter="staBatchSelectConfirm" lay-submit="">纭畾</button> + </form> +</script> + +<script type="text/html" id="locNoTpl"> + <span name="locNo" + {{# if( d.lack === false){ }} + class="layui-badge layui-badge-green" >{{d.locNo}}</span> + {{# } else { }} + class="layui-badge layui-badge-red" >搴撳瓨涓嶈冻</span> + {{# } }} +</script> +<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script> +<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script> +<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/echarts/echarts.min.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/orderTable.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/orderGift/orderGift.js" charset="utf-8"></script> + +<script type="text/template" id="docTypeTpl"> + <option value="">閫夋嫨绫诲瀷</option> + {{#each records}} + <option value="{{docId}}">{{docName}}</option> + {{/each}} +</script> +</body> + + +<script type="text/template" id="batchStaSelectTpl"> + <option value="">閫夋嫨鍑哄簱绔�</option> + {{#each list}} + <option value="{{this}}">{{this}}</option> + {{/each}} +</script> + +</html> + diff --git a/src/main/webapp/views/orderGift/outGift.html b/src/main/webapp/views/orderGift/outGift.html new file mode 100644 index 0000000..0d7e344 --- /dev/null +++ b/src/main/webapp/views/orderGift/outGift.html @@ -0,0 +1,314 @@ +<!DOCTYPE html> +<html lang="en"> +<head> + <meta charset="utf-8"> + <title></title> + <meta name="renderer" content="webkit"> + <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> + <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> + <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all"> + <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all"> + <link rel="stylesheet" href="../../static/css/cool.css" media="all"> + <link rel="stylesheet" href="../../static/css/originTable.css" media="all"> + <style> + body { + color: #595959; + background-color: #f5f7f9; + } + + .admin-form { + padding: 25px 30px 0 0 !important; + margin: 0 !important; + } + + .layui-table-view .layui-table-cell .layui-select-title .layui-input { + height: 28px; + line-height: 28px; + } + + .layui-table-view [lay-size="lg"] .layui-table-cell .layui-select-title .layui-input { + height: 40px; + line-height: 40px; + } + + .layui-table-view [lay-size="lg"] .layui-table-cell .layui-select-title .layui-input { + height: 40px; + line-height: 40px; + } + + .layui-table-view [lay-size="sm"] .layui-table-cell .layui-select-title .layui-input { + height: 20px; + line-height: 20px; + } + + .layui-table-view [lay-size="sm"] .layui-table-cell .layui-btn-xs { + height: 18px; + line-height: 18px; + } + + /* 鏉冮檺鎺у埗 */ + #btn-pakoutPreview { + display: none; + } + /*#btn-delete {*/ + /* display: none;*/ + /*}*/ + /*.btn-edit {*/ + /* display: none;*/ + /*}*/ + /*.btn-more {*/ + /* display: none;*/ + /*}*/ + </style> +</head> +<body> +<!-- 姝f枃寮�濮� --> +<div class="layui-fluid" style="padding-bottom: 0;"> + <div class="layui-row layui-col-space15"> + <!-- 宸� --> + <div class="layui-col-md3" id="left-table"> + <div class="layui-card"> + <div class="layui-card-body" style="padding: 10px;"> + <form class="layui-form toolbar"> + <div class="layui-form-item"> + <div class="layui-inline" style="max-width: 300px;"> + <input name="orderNo" class="layui-input" placeholder="杈撳叆鍗曟嵁缂栧彿" autocomplete="off"/> + </div> + <div class="layui-inline"> + <button class="layui-btn icon-btn" lay-filter="originTableSearch" lay-submit> + <i class="layui-icon"></i>鎼滅储 + </button> + <button class="layui-btn icon-btn" lay-filter="originTbReset" lay-submit> + <i class="layui-icon"></i>閲嶇疆 + </button> + </div> + </div> + </form> + <table id="originTable" lay-filter="originTable"></table> + </div> + </div> + </div> + <!-- 鍙� --> + <div class="layui-col-md9"> + <div class="layui-card"> + <div class="layui-card-body" style="padding: 10px;"> + <form class="layui-form toolbar"> + <div class="layui-form-item"> + <div class="layui-inline"> + <label class="layui-form-label">鍟嗗搧缂栫爜:</label> + <div class="layui-input-inline"> + <input name="matnr" class="layui-input" placeholder="鍟嗗搧缂栫爜"/> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label">鍟嗗搧鍚嶇О:</label> + <div class="layui-input-inline"> + <input name="maktx" class="layui-input" placeholder="鍟嗗搧鍚嶇О"/> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label">搴忓垪鐮�:</label> + <div class="layui-input-inline"> + <input name="batch" class="layui-input" placeholder="搴忓垪鐮�"/> + </div> + </div> + <!-- <div class="layui-inline">--> + <!-- <label class="layui-form-label">鐘舵��:</label>--> + <!-- <div class="layui-input-inline">--> + <!-- <select name="isOnline">--> + <!-- <option value="1">鍏呯數涓�</option>--> + <!-- <option value="1">鍏呯數涓�</option>--> + <!-- <option value="0">涓嶅湪鍏呯數</option>--> + <!-- </select>--> + <!-- </div>--> + <!-- </div>--> + <div class="layui-inline">  + <button class="layui-btn icon-btn" lay-filter="sensorTbSearch" lay-submit> + <i class="layui-icon"></i>鎼滅储 + </button> + </div> + </div> + </form> + <table id="orderDetlTable" lay-filter="orderDetlTable"></table> + </div> + </div> + </div> + </div> +</div> + +<!-- 澶村伐鍏锋爮 --> +<script type="text/html" id="orderDetToolbar"> + + <!-- <div class="layui-btn-container">--> + <!-- <div class="layui-col-md3">--> + <!-- <select id="staNoSelect" lay-verify="required">--> + <!-- <option value="">璇烽�夋嫨绔欑偣</option>--> + <!-- </select>--> + <!-- </div>--> + <!-- </div>--> + <button class="layui-btn layui-btn-sm layui-btn-danger btn-pakoutPreview" id="btn-pakoutPreview" lay-event="pakoutPreview">鎵归噺鍑哄簱</button> + +</script> + +<!-- 琛屽伐鍏锋爮 --> +<script type="text/html" id="operate"> + {{#if (d.enableQty > 0){ }} + <a class="layui-btn layui-btn-xs layui-btn-danger btn-pakoutPreview" lay-event="pakoutPreview"><i class="layui-icon layui-icon-prev-circle"></i>鍑哄簱</a> + {{# } }} +</script> + +<!-- 鍑哄簱棰勮 --> +<script type="text/html" id="pakoutPreviewBox" style="display: none"> + <div style="padding: 25px; line-height: 22px; background-color: #393D49; color: #fff; font-weight: 300;"> + <span style="font-size: large; font-weight: bold">鍑哄簱棰勮</span> + </div> + <div class="layui-card"> + <div class="layui-card-body" style="padding: 10px"> + <table id="stoPreTab" lay-filter="stoPreTab"></table> + </div> + <button class="layui-btn layui-btn-primary layui-border-black layui-btn-sm" lay-filter="batchModifySta" lay-submit style="display: block;float: right;margin-right: 1rem"> + 鎵归噺淇敼 + </button> + </div> +</script> + +<script type="text/html" id="tbBasicTbStaNos"> + <div class="ew-select-fixed"> + <select class="order-sta-select" lay-filter="tbBasicTbStaNos"> + {{#if (d.staNos!=null) {}} + {{# for(let i=0; i<d.staNos.length; i++) { }} + <option value="{{d.staNos[i]}}">{{d.staNos[i]}}</option> + {{# } }} + {{# } }} + </select> + </div> +</script> + +<script type="text/html" id="staBatchSelectDialog"> + <form class="layui-form" style="padding: 25px 50px 30px 50px;text-align: center"> + <select id="batchSelectStaBox" name="batchSta" lay-vertype="tips" lay-verify="required" required=""> + </select> + <button style="margin-top: 30px" class="layui-btn" lay-filter="staBatchSelectConfirm" lay-submit="">纭畾</button> + </form> +</script> + +<script type="text/html" id="locNoTpl"> + <span name="locNo" + {{# if( d.lack === false){ }} + class="layui-badge layui-badge-green" >{{d.locNo}}</span> + {{# } else { }} + class="layui-badge layui-badge-red" >搴撳瓨涓嶈冻</span> + {{# } }} +</script> + +<!-- 琛屾牱寮� --> +<script type="text/html" id="orderNoTpl"> + <span name="orderNo" class="layui-badge layui-badge-gray">{{d.orderNo}}</span> +</script> +<script type="text/html" id="statusTpl"> + <input type="checkbox" name="status" value="{{d.status}}" lay-skin="switch" lay-text="姝e父|绂佺敤" lay-filter="statusSwitch" {{ d.status === 1 ? 'checked' : '' }}> +</script> + +<!-- 琛ㄥ崟寮圭獥 --> +<script type="text/html" id="editDialog"> + <form id="detail" lay-filter="detail" class="layui-form admin-form"> + <input name="id" type="hidden"> + <input name="status" type="hidden"> + <div class="layui-row"> + + <div class="layui-col-md4"> + <div class="layui-form-item"> + <label class="layui-form-label layui-form-required">璁惧缂栧彿</label> + <div class="layui-input-block"> + <input name="uuid" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" class="layui-input" lay-vertype="tips" lay-verify="required" required=""> + </div> + </div> + </div> + <div class="layui-col-md4"> + <div class="layui-form-item"> + <label class="layui-form-label">璁惧绫诲瀷锛�</label> + <div class="layui-input-block"> + <div id="modelSel" class="ew-xmselect-tree"></div> + </div> + </div> + </div> + <div class="layui-col-md4"> + <div class="layui-form-item"> + <label class="layui-form-label layui-form-required">鎵�灞為」鐩�: </label> + <div class="layui-input-block cool-auto-complete"> + <input name="hostId" class="layui-input" style="display: none"> + <input id="hostId$" name="hostId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇烽�夋嫨鎵�灞為」鐩�" onfocus=this.blur()> + <div class="cool-auto-complete-window"> + <input class="cool-auto-complete-window-input" data-key="hostQueryByhostId" onkeyup="autoLoad(this.getAttribute('data-key'))"> + <select class="cool-auto-complete-window-select" data-key="hostQueryByhostIdSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> + </select> + </div> + </div> + </div> + </div> + <div class="layui-col-md12"> + <div class="layui-form-item"> + <label class="layui-form-label">璇︾粏鍦板潃</label> + <div class="layui-input-block"> + <input name="addr" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" class="layui-input"> + </div> + </div> + </div> + <hr class="layui-bg-gray"> + <div class="layui-col-md12" style="text-align: center"> + <iframe id="mapIframe" src="map.html" scrolling="no" frameborder="0" + style="display: inline-block; width: 90%;height: 400px;margin: auto"> + </iframe> + </div> + + </div> + <hr class="layui-bg-gray"> + <div class="layui-form-item text-right"> + <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button> + <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button> + </div> + </form> +</script> + +<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script> +<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script> +<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/tools/md5.js"></script> +<script type="text/javascript" src="../../static/js/orderTable.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/order/out.js" charset="utf-8"></script> +<!--<script type="text/template" id="takeSiteSelectTemplate">--> +<!-- {{#each data}}--> +<!-- <option value="{{siteId}}">{{desc}}</option>--> +<!-- {{/each}}--> +<!--</script>--> +<!-- 椤圭洰缂栬緫绐楀彛 --> +<script type="text/html" id="hostEditDialog"> + <form id="hostEditForm" lay-filter="hostEditForm" class="layui-form model-form"> + <input name="id" type="hidden"/> + <div class="layui-form-item"> + <label class="layui-form-label layui-form-required">椤圭洰鍚嶇О:</label> + <div class="layui-input-block"> + <input name="name" placeholder="璇疯緭鍏ョ被鍨嬪悕绉�" class="layui-input" + lay-verType="tips" lay-verify="required" required/> + </div> + </div> + <div class="layui-form-item text-right"> + <button class="layui-btn" lay-filter="hostEditSubmit" lay-submit>淇濆瓨</button> + <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button> + </div> + </form> +</script> + +</body> + +<script type="text/template" id="batchStaSelectTpl"> + <option value="">閫夋嫨鍑哄簱绔�</option> + {{#each list}} + <option value="{{this}}">{{this}}</option> + {{/each}} +</script> + +</html> + -- Gitblit v1.9.1