src/main/java/com/zy/asrs/controller/MobileController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/controller/OrderController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/entity/OrderDetl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/OrderService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/OrderDetlMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/webapp/static/js/order/order.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/webapp/views/order/order0.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/MobileController.java
@@ -7,10 +7,13 @@ import com.core.common.R; import com.zy.asrs.entity.LocDetl; import com.zy.asrs.entity.LocMast; import com.zy.asrs.entity.Order; import com.zy.asrs.entity.OrderDetl; import com.zy.asrs.entity.param.CombParam; import com.zy.asrs.service.LocDetlService; import com.zy.asrs.service.LocMastService; import com.zy.asrs.service.MobileService; import com.zy.asrs.service.OrderService; import com.zy.common.model.MobileLocDetlVo; import com.zy.common.web.BaseController; import org.springframework.beans.factory.annotation.Autowired; @@ -36,6 +39,27 @@ private LocMastService locMastService; @Autowired private LocDetlService locDetlService; @Autowired private OrderService orderService; /** * 根据单号检索单据数据 */ @RequestMapping("/order/serach/orderNo/auth") @ManagerAuth public R orderSearchByBarcode(@RequestParam String orderNo){ Order order = orderService.selectByNo(orderNo); if (order.getSettle() > 2) { return R.ok(); } List<OrderDetl> orderDetls = orderService.selectWorkingDetls(orderNo); if (Cools.isEmpty(orderDetls)) { return R.ok(); } return R.ok().add(orderDetls); } /** * 组托 @@ -47,16 +71,6 @@ return R.ok(); } /** * 组托 */ @RequestMapping("/comb/form") @ManagerAuth(memo = "组托") public R combForm(@RequestParam CombParam combParam){ mobileService.comb(combParam, getUserId()); return R.ok(); } /** * 根据库位号查找库存明细 src/main/java/com/zy/asrs/controller/OrderController.java
@@ -107,6 +107,7 @@ orderDetl.setUpdateBy(getUserId()); orderDetl.setUpdateTime(now); orderDetl.setStatus(1); orderDetl.setQty(0.0D); if (!orderDetlService.insert(orderDetl)) { throw new CoolException("保存订单明细档失败"); } @@ -151,6 +152,7 @@ detl.setUpdateTime(now); detl.setUpdateBy(userId); detl.setStatus(1); detl.setQty(0.0D); // 修改 } else { detl.setAnfme(orderDetl.getAnfme()); // 修改数量 src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -44,6 +44,12 @@ private Double anfme; /** * 作业数量 */ @ApiModelProperty(value= "作业数量") private Double qty; /** * 商品编码 */ @ApiModelProperty(value= "商品编码") src/main/java/com/zy/asrs/service/OrderService.java
@@ -2,9 +2,14 @@ import com.zy.asrs.entity.Order; import com.baomidou.mybatisplus.service.IService; import com.zy.asrs.entity.OrderDetl; import java.util.List; public interface OrderService extends IService<Order> { Order selectByNo(String orderNo); List<OrderDetl> selectWorkingDetls(String orderNo); } src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.common.Cools; import com.zy.asrs.entity.OrderDetl; import com.zy.asrs.mapper.OrderMapper; import com.zy.asrs.entity.Order; import com.zy.asrs.service.OrderService; @@ -21,4 +22,11 @@ } return orderList.get(0); } @Override public List<OrderDetl> selectWorkingDetls(String orderNo) { return null; } } src/main/resources/mapper/OrderDetlMapper.xml
@@ -7,6 +7,7 @@ <id column="id" property="id" /> <result column="order_id" property="orderId" /> <result column="anfme" property="anfme" /> <result column="qty" property="qty" /> <result column="matnr" property="matnr" /> <result column="maktx" property="maktx" /> <result column="name" property="name" /> src/main/webapp/static/js/order/order.js
@@ -77,7 +77,7 @@ layer.open({ type: 1, title: false, area: '750px', area: '800px', offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'], shade: .01, shadeClose: true, @@ -99,6 +99,7 @@ {field: 'maktx', title: '商品名称', width: 160}, {field: 'batch', title: '批号'}, {field: 'anfme', title: '数量'}, {field: 'qty', title: '作业数量', style: 'font-weight: bold'}, {field: 'unit', title: '单位'}, // { // field: 'createTime$', title: '创建时间', sort: true, templet: function (d) { src/main/webapp/views/order/order0.html
File was deleted