src/main/java/com/zy/asrs/controller/OpenController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/entity/AcQuantity.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/OrderDetlService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/OrderDetlMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/OpenController.java
@@ -7,6 +7,7 @@ import com.core.common.Cools; import com.core.common.R; import com.core.exception.CoolException; import com.zy.asrs.entity.AcQuantity; import com.zy.asrs.entity.LocMast; import com.zy.asrs.entity.OrderDetl; import com.zy.asrs.entity.param.*; @@ -142,10 +143,10 @@ * */ @PostMapping("/order/AcQuantity/default/v1") public synchronized R loadQuantity(@RequestParam String orderNo){ List<OrderDetl> OrderDetlList; if(orderNo != null){ OrderDetlList = orderDetlService.loadQuantity(orderNo); public synchronized R loadQuantity(@RequestBody AcQuantity param){ List<AcQuantity> OrderDetlList; if(param.getOrderNo() != null){ OrderDetlList = orderDetlService.loadQuantity(param.getOrderNo()); }else{ return R.error("单据编号[orderNo]不能为空"); } src/main/java/com/zy/asrs/entity/AcQuantity.java
New file @@ -0,0 +1,62 @@ package com.zy.asrs.entity; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableName; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @TableName("man_order_detl") public class AcQuantity { /** * 订单内码 */ @ApiModelProperty(value = "订单内码") @TableField("order_id") private Long orderId; /** * 单据编号 */ @ApiModelProperty(value = "单据编号") @TableField("order_no") private String orderNo; /** * 数量 */ @ApiModelProperty(value = "数量") private Double anfme; /** * 作业数量 * <p> * 入库 : 组托完成,组托档、工作档、入库完成数量 * 出库 : 工作档、出库完成数量 */ @ApiModelProperty(value = "作业数量") @TableField("work_qty") private Double workQty; /** * 完成数量 * <p> * 入库 : qty 👆 * 出库 : qty 👆 */ @ApiModelProperty(value = "完成数量") private Double qty; /** * 商品名称 */ @ApiModelProperty(value = "商品名称") private String maktx; /** * 代码 */ @ApiModelProperty(value = "代码") private String model; } src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
@@ -1,6 +1,7 @@ package com.zy.asrs.mapper; import com.baomidou.mybatisplus.mapper.BaseMapper; import com.zy.asrs.entity.AcQuantity; import com.zy.asrs.entity.OrderDetl; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -18,7 +19,7 @@ List<OrderDetl> selectItemByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch); List<OrderDetl> selectWorkingDetls(Long orderId); List<OrderDetl> loadQuantity(String orderNo); List<AcQuantity> loadQuantity(String orderNo); List<OrderDetl> getPakoutPage(Map<String, Object> map); src/main/java/com/zy/asrs/service/OrderDetlService.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.IService; import com.zy.asrs.entity.AcQuantity; import com.zy.asrs.entity.OrderDetl; import com.zy.asrs.entity.WaitPakin; import com.zy.asrs.entity.WrkDetl; @@ -48,7 +49,7 @@ boolean increaseWorkQty(OrderDetl orderDetl, Double workQty); List<OrderDetl> selectItem(String orderNo); List<OrderDetl> loadQuantity(String orderNo); List<AcQuantity> loadQuantity(String orderNo); OrderDetl selectItem(WaitPakin waitPakin); src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.core.common.Cools; import com.zy.asrs.entity.AcQuantity; import com.zy.asrs.entity.OrderDetl; import com.zy.asrs.entity.WaitPakin; import com.zy.asrs.entity.WrkDetl; @@ -31,7 +32,7 @@ } @Override public List<OrderDetl> loadQuantity(String orderNo){ public List<AcQuantity> loadQuantity(String orderNo){ return baseMapper.loadQuantity(orderNo); } src/main/resources/mapper/OrderDetlMapper.xml
@@ -60,6 +60,16 @@ <result column="packing" property="packing" /> <result column="det_id" property="detId"/> </resultMap> <resultMap id="AcResultMap" type="com.zy.asrs.entity.AcQuantity"> <result column="order_id" property="orderId" /> <result column="order_no" property="orderNo" /> <result column="anfme" property="anfme" /> <result column="work_qty" property="workQty" /> <result column="qty" property="qty" /> <result column="maktx" property="maktx" /> <result column="model" property="model" /> </resultMap> <select id="selectItem" resultMap="BaseResultMap"> select * from man_order_detl @@ -98,8 +108,8 @@ and qty < anfme </select> <select id="loadQuantity" resultMap="BaseResultMap"> select order_id,order_no,model,maktx,anfme,qty from man_order_detl <select id="loadQuantity" resultMap="AcResultMap"> select order_id,order_no,model,maktx,anfme,qty,work_qty from man_order_detl where order_no = #{orderNo} </select>