From 7664edab4a16db375b46d35bb55771d798edcdce Mon Sep 17 00:00:00 2001 From: 15066119699 Date: Tue, 11 Mar 2025 12:33:15 +0800 Subject: [PATCH] 1 --- .../controller/app/AppGoodsController.java | 15 +++++ .../web/controller/app/AppPmsController.java | 63 ++++++++++++++++--- .../app/AppPmsOrderInController.java | 12 ++-- .../web/controller/app/AppTaskController.java | 4 +- .../ruoyi/web/domain/PmsOrderInRequest.java | 12 ++++ .../java/com/ruoyi/app/domain/AppGoods.java | 27 +++++++- .../com/ruoyi/app/domain/AppPmsOrderIn.java | 41 +++++++----- .../com/ruoyi/app/mapper/AppGoodsMapper.java | 1 + .../ruoyi/app/mapper/AppPmsOrderInMapper.java | 11 ++-- .../ruoyi/app/service/IAppGoodsService.java | 2 + .../app/service/IAppPmsOrderInService.java | 7 +-- .../app/service/impl/AppGoodsServiceImpl.java | 6 ++ .../impl/AppPmsOrderInServiceImpl.java | 14 ++--- .../resources/mapper/app/AppGoodsMapper.xml | 28 ++++++++- .../mapper/app/AppPmsOrderInMapper.xml | 29 +++++---- 15 files changed, 204 insertions(+), 68 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppGoodsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppGoodsController.java index 2e545529..f07a57d2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppGoodsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppGoodsController.java @@ -5,7 +5,9 @@ import javax.servlet.http.HttpServletResponse; import com.ruoyi.app.domain.AppGoods; import com.ruoyi.app.domain.AppLocation; +import com.ruoyi.app.domain.AppStock; import com.ruoyi.app.service.IAppGoodsService; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.web.controller.section.EnhanceDataList; import org.apache.commons.lang3.ObjectUtils; import org.springframework.security.access.prepost.PreAuthorize; @@ -137,4 +139,17 @@ public class AppGoodsController extends BaseController { appGoodsService.changeGoodsIsEnableStatus(goodsIds); return success("修改状态成功"); } + + /** + * 模糊搜索物料信息列表，根据物料Id + */ + @GetMapping(value = "/queryListByGoodsId") + public AjaxResult queryListByGoodsId(AppGoods appGoods) + { + if(StringUtils.isBlank(appGoods.getGoodsId())){ + return error("查询物料编号不能为空"); + } + List appGoodsList = appGoodsService.queryListByGoodsId(appGoods.getGoodsId()); + return success("查询成功",appGoodsList); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java index 9a27c444..9e4c4c4e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java @@ -50,6 +50,45 @@ public class AppPmsController extends BaseController { private final List orderInTypeList = Arrays.asList(1, 2, 3, 4, 5, 6,7,8); + + /** + * Pms入库单请求 + */ + @ApiOperation("手动入库单请求") + @Log(title = "手动入库单请求", skipAuth = true) + @PostMapping("/orderInList") + public AjaxResult manualOrderIn(@RequestBody List orderInRequestList) { + logger.info("手动入库单请求：{}", orderInRequestList); + // TODO + // 判断数据是否缺失 + String orderId= OrderCodeFactory.getOrderCode("RK", ""); + for(PmsOrderInRequest orderInRequest : orderInRequestList) { + if (StringUtils.isEmpty(orderInRequest.getGoodsId()) + || StringUtils.isEmpty(orderInRequest.getGoodsDesc()) + || orderInRequest.getGoodsNum() == null || orderInRequest.getGoodsNum() <=0) { + return error("缺少请求数据。"); + } + + AppPmsOrderIn appPmsOrderIn = new AppPmsOrderIn(); + BeanUtils.copyProperties(orderInRequest, appPmsOrderIn); + appPmsOrderIn.setId(OrderCodeFactory.getOrderCode("","")); + appPmsOrderIn.setListId(orderId); + appPmsOrderIn.setOrderType(9); + appPmsOrderIn.setGoodsNum(BigDecimal.valueOf(orderInRequest.getGoodsNum())); + appPmsOrderIn.setUsedNum(BigDecimal.ZERO); + appPmsOrderIn.setRemainingNum(BigDecimal.valueOf(orderInRequest.getGoodsNum())); + appPmsOrderIn.setOrderStatus(0); + appPmsOrderIn.setCreateTime(new Date()); + appPmsOrderIn.setUpdateTime(new Date()); + appPmsOrderIn.setCreateBy(getUsername()); + + + appPmsOrderInService.insertAppPmsOrderIn(appPmsOrderIn); + } + + return AjaxResult.success("success"); + } + /** * Pms入库单请求 */ @@ -72,17 +111,20 @@ public class AppPmsController extends BaseController { return error("缺少请求数据。"); } // 判断入库单号是否重复 - AppPmsOrderIn existAppPmsOrderIn = appPmsOrderInService.selectAppPmsOrderInByListId(orderInRequest.getListId()); - if (existAppPmsOrderIn != null) { + AppPmsOrderIn pmsOrderIn = new AppPmsOrderIn(); + pmsOrderIn.setListId(orderInRequest.getListId()); + List appPmsOrderIns = appPmsOrderInService.selectAppPmsOrderInList(pmsOrderIn); + if (CollectionUtils.isNotEmpty(appPmsOrderIns)) { return AjaxResult.error("入库单已存在"); } AppPmsOrderIn appPmsOrderIn = new AppPmsOrderIn(); BeanUtils.copyProperties(orderInRequest, appPmsOrderIn); - appPmsOrderIn.setOrderType(Long.valueOf(orderInRequest.getOrderType())); + appPmsOrderIn.setId(OrderCodeFactory.getOrderCode("","")); + appPmsOrderIn.setOrderType(orderInRequest.getOrderType()); appPmsOrderIn.setGoodsNum(BigDecimal.valueOf(orderInRequest.getGoodsNum())); appPmsOrderIn.setUsedNum(BigDecimal.valueOf(0)); appPmsOrderIn.setRemainingNum(BigDecimal.valueOf(orderInRequest.getGoodsNum())); - appPmsOrderIn.setOrderStatus(Long.valueOf(0)); + appPmsOrderIn.setOrderStatus(0); appPmsOrderIn.setCreateTime(new Date()); appPmsOrderIn.setUpdateTime(new Date()); @@ -109,7 +151,8 @@ public class AppPmsController extends BaseController { int insertRow = 0; // 判断请求数据完整性 //生成wms统一订单号 - String orderId= OrderCodeFactory.getOrderCode("WMS", ""); + String id= OrderCodeFactory.getOrderCode("", ""); + String orderId= OrderCodeFactory.getOrderCode("CK", ""); for(PmsOrderOutRequest orderOutRequest : orderOutRequests) { //如果是内部inner=true，不需要判断listId if(!orderOutRequest.isInner()){ @@ -124,9 +167,11 @@ public class AppPmsController extends BaseController { return error("请求数据不完整。"); } // 判断出库单号是否重复 - AppPmsOrderOut existAppPmsOrderOut = appPmsOrderOutService.selectAppPmsOrderOutByListId(orderOutRequest.getListId()); - if (existAppPmsOrderOut != null) { - return error("出库单号重复。"); + if(!orderOutRequest.isInner()) { + AppPmsOrderOut existAppPmsOrderOut = appPmsOrderOutService.selectAppPmsOrderOutByListId(orderOutRequest.getListId()); + if (existAppPmsOrderOut != null) { + return error("出库单号重复。"); + } } //查询库存是否足够 AppStock appStock = new AppStock(); @@ -147,7 +192,7 @@ public class AppPmsController extends BaseController { AppPmsOrderOut appPmsOrderOut = new AppPmsOrderOut(); appPmsOrderOut.setRecordId(UUID.randomUUID().toString()); - appPmsOrderOut.setOrderId(orderId); + appPmsOrderOut.setOrderId(id); if(orderOutRequest.isInner()){ appPmsOrderOut.setListId(orderId); }else { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsOrderInController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsOrderInController.java index 93b41760..db173aa7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsOrderInController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsOrderInController.java @@ -69,10 +69,10 @@ public class AppPmsOrderInController extends BaseController * 获取【请填写功能名称】详细信息 */ @PreAuthorize("@ss.hasPermi('system:in:query')") - @GetMapping(value = "/{listId}") - public AjaxResult getInfo(@PathVariable("listId") String listId) + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) { - return success(appPmsOrderInService.selectAppPmsOrderInByListId(listId)); + return success(appPmsOrderInService.selectAppPmsOrderInById(id)); } /** @@ -102,10 +102,10 @@ public class AppPmsOrderInController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:in:remove')") @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE) - @DeleteMapping("/{listIds}") - public AjaxResult remove(@PathVariable String[] listIds) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) { - return toAjax(appPmsOrderInService.deleteAppPmsOrderInByListIds(listIds)); + return toAjax(appPmsOrderInService.deleteAppPmsOrderInByIds(ids)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java index 8355ede9..7a241611 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java @@ -498,13 +498,13 @@ public class AppTaskController extends BaseController //更新pms任务表 AppPmsOrderIn appPmsOrderIn1 = new AppPmsOrderIn(); appPmsOrderIn1.setGoodsId(appTask2.getGoodsId()); - appPmsOrderIn1.setOrderStatus(Long.valueOf(0)); + appPmsOrderIn1.setOrderStatus(0); List appPmsOrderIns1 = appPmsOrderInService.selectAppPmsOrderInList(appPmsOrderIn1); if(ObjectUtil.isEmpty(appPmsOrderIns1)){ return error("物料未绑定托盘"); } AppPmsOrderIn appPmsOrderIn2 = appPmsOrderIns1.get(0); - appPmsOrderIn2.setOrderStatus(2L); + appPmsOrderIn2.setOrderStatus(2); appPmsOrderIn2.setUsedNum(BigDecimal.valueOf(orderInRequest.getGoodsNum())); appPmsOrderIn2.setRemainingNum(appPmsOrderIn2.getGoodsNum().subtract(BigDecimal.valueOf(orderInRequest.getGoodsNum()))); int i1 = appPmsOrderInService.updateAppPmsOrderIn(appPmsOrderIn2); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/domain/PmsOrderInRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/web/domain/PmsOrderInRequest.java index 31cd410d..9e580bad 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/domain/PmsOrderInRequest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/domain/PmsOrderInRequest.java @@ -36,6 +36,10 @@ public class PmsOrderInRequest { * 物料描述 */ private String goodsDesc; + /** + * 物料描述 + */ + private String goodsName; /** * 单位 */ @@ -49,6 +53,14 @@ public class PmsOrderInRequest { */ private String spare2; + public String getGoodsName() { + return goodsName; + } + + public void setGoodsName(String goodsName) { + this.goodsName = goodsName; + } + public String getListId() { return listId; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppGoods.java b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppGoods.java index 158763a5..14711219 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppGoods.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppGoods.java @@ -29,9 +29,13 @@ public class AppGoods extends BaseEntity { /** * 物料名称/描述 */ - @Excel(name = "物料描述") + @Excel(name = "物料名称") private String goodsName; - + /** + * 物料名称/描述 + */ + @Excel(name = "物料描述") + private String goodsDesc; /** * 单位 */ @@ -60,7 +64,8 @@ public class AppGoods extends BaseEntity { */ @Excel(name = "状态", readConverterExp = "0=启用,1=禁用") private Long goodsStatus; - + @Excel(name = "物料条码") + private String goodsCode; /** * 最近更新用户 */ @@ -74,6 +79,22 @@ public class AppGoods extends BaseEntity { // @Excel(name = "最近更新时间", width = 30, dateFormat = "yyyy-MM-dd") private Date lastUpdateTime; + public String getGoodsDesc() { + return goodsDesc; + } + + public String getGoodsCode() { + return goodsCode; + } + + public void setGoodsCode(String goodsCode) { + this.goodsCode = goodsCode; + } + + public void setGoodsDesc(String goodsDesc) { + this.goodsDesc = goodsDesc; + } + public Long getId() { return id; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppPmsOrderIn.java b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppPmsOrderIn.java index 68a8c83d..0f2dd310 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppPmsOrderIn.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppPmsOrderIn.java @@ -15,13 +15,15 @@ import com.ruoyi.common.core.domain.BaseEntity; public class AppPmsOrderIn extends BaseEntity { private static final long serialVersionUID = 1L; + // 主键 + private String id; /** 入库单号 */ private String listId; /** 订单类型 */ @Excel(name = "订单类型") - private Long orderType; + private Integer orderType; /** 客户ID */ @Excel(name = "客户ID") @@ -69,7 +71,7 @@ public class AppPmsOrderIn extends BaseEntity /** 订单状态 */ @Excel(name = "订单状态") - private Long orderStatus; + private Integer orderStatus; public void setListId(String listId) { @@ -80,20 +82,32 @@ public class AppPmsOrderIn extends BaseEntity { return listId; } - public void setOrderType(Long orderType) - { - this.orderType = orderType; - } - public Long getOrderType() - { - return orderType; - } public void setCustomerId(String customerId) { this.customerId = customerId; } + public Integer getOrderType() { + return orderType; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public void setOrderType(Integer orderType) { + this.orderType = orderType; + } + + public void setOrderStatus(Integer orderStatus) { + this.orderStatus = orderStatus; + } + public String getCustomerId() { return customerId; @@ -188,13 +202,8 @@ public class AppPmsOrderIn extends BaseEntity { return spare2; } - public void setOrderStatus(Long orderStatus) - { - this.orderStatus = orderStatus; - } - public Long getOrderStatus() - { + public Integer getOrderStatus() { return orderStatus; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppGoodsMapper.java b/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppGoodsMapper.java index 4c73c4d1..c95bdc3f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppGoodsMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppGoodsMapper.java @@ -77,4 +77,5 @@ public interface AppGoodsMapper */ List selectAppGoodsListByIds(String[] goodsIds); + List queryListByGoodsId(String goodsId); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppPmsOrderInMapper.java b/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppPmsOrderInMapper.java index 851b641e..ba23dd9a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppPmsOrderInMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/mapper/AppPmsOrderInMapper.java @@ -17,11 +17,10 @@ public interface AppPmsOrderInMapper /** * 查询【请填写功能名称】 * - * @param listId 【请填写功能名称】主键 + * @param id 【请填写功能名称】主键 * @return 【请填写功能名称】 */ - public AppPmsOrderIn selectAppPmsOrderInByListId(String listId); - + public AppPmsOrderIn selectAppPmsOrderInById(String id); /** * 查询【请填写功能名称】列表 * @@ -52,7 +51,7 @@ public interface AppPmsOrderInMapper * @param listId 【请填写功能名称】主键 * @return 结果 */ - public int deleteAppPmsOrderInByListId(String listId); + public int deleteAppPmsOrderInById(String id); public List selectAppPmsOrderInListWithParam(@Param("param") String param); @@ -60,8 +59,8 @@ public interface AppPmsOrderInMapper /** * 批量删除【请填写功能名称】 * - * @param listIds 需要删除的数据主键集合 + * @param ids 需要删除的数据主键集合 * @return 结果 */ - public int deleteAppPmsOrderInByListIds(String[] listIds); + public int deleteAppPmsOrderInByIds(String[] ids); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppGoodsService.java b/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppGoodsService.java index 5cb43a50..fbec37a7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppGoodsService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppGoodsService.java @@ -81,4 +81,6 @@ public interface IAppGoodsService * @return */ String importGoods(List appGoodsList, boolean updateSupport); + + List queryListByGoodsId(String goodsId); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppPmsOrderInService.java b/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppPmsOrderInService.java index af49196e..ef954554 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppPmsOrderInService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/service/IAppPmsOrderInService.java @@ -20,8 +20,7 @@ public interface IAppPmsOrderInService * @param listId 【请填写功能名称】主键 * @return 【请填写功能名称】 */ - public AppPmsOrderIn selectAppPmsOrderInByListId(String listId); - + public AppPmsOrderIn selectAppPmsOrderInById(String listId); /** * 查询【请填写功能名称】列表 * @@ -52,7 +51,7 @@ public interface IAppPmsOrderInService * @param listIds 需要删除的【请填写功能名称】主键集合 * @return 结果 */ - public int deleteAppPmsOrderInByListIds(String[] listIds); + public int deleteAppPmsOrderInByIds(String[] listIds); /** * 删除【请填写功能名称】信息 @@ -60,7 +59,7 @@ public interface IAppPmsOrderInService * @param listId 【请填写功能名称】主键 * @return 结果 */ - public int deleteAppPmsOrderInByListId(String listId); + public int deleteAppPmsOrderInById(String listId); public List getInfoWithString(String param); diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppGoodsServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppGoodsServiceImpl.java index 0174b057..ce280404 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppGoodsServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppGoodsServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.app.service.impl; +import java.util.Collections; import java.util.List; import cn.hutool.core.collection.CollectionUtil; @@ -159,4 +160,9 @@ public class AppGoodsServiceImpl implements IAppGoodsService { } return successMsg.toString(); } + + @Override + public List queryListByGoodsId(String goodsId) { + return appGoodsMapper.queryListByGoodsId(goodsId); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPmsOrderInServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPmsOrderInServiceImpl.java index a32a71e1..a84fcdcc 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPmsOrderInServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppPmsOrderInServiceImpl.java @@ -40,9 +40,9 @@ public class AppPmsOrderInServiceImpl implements IAppPmsOrderInService * @return 【请填写功能名称】 */ @Override - public AppPmsOrderIn selectAppPmsOrderInByListId(String listId) + public AppPmsOrderIn selectAppPmsOrderInById(String id) { - return appPmsOrderInMapper.selectAppPmsOrderInByListId(listId); + return appPmsOrderInMapper.selectAppPmsOrderInById(id); } /** @@ -88,21 +88,21 @@ public class AppPmsOrderInServiceImpl implements IAppPmsOrderInService * @return 结果 */ @Override - public int deleteAppPmsOrderInByListIds(String[] listIds) + public int deleteAppPmsOrderInByIds(String[] listIds) { - return appPmsOrderInMapper.deleteAppPmsOrderInByListIds(listIds); + return appPmsOrderInMapper.deleteAppPmsOrderInByIds(listIds); } /** * 删除【请填写功能名称】信息 * - * @param listId 【请填写功能名称】主键 + * @param id 【请填写功能名称】主键 * @return 结果 */ @Override - public int deleteAppPmsOrderInByListId(String listId) + public int deleteAppPmsOrderInById(String id) { - return appPmsOrderInMapper.deleteAppPmsOrderInByListId(listId); + return appPmsOrderInMapper.deleteAppPmsOrderInById(id); } @Override diff --git a/ruoyi-system/src/main/resources/mapper/app/AppGoodsMapper.xml b/ruoyi-system/src/main/resources/mapper/app/AppGoodsMapper.xml index 5dc2ffa8..3b50198a 100644 --- a/ruoyi-system/src/main/resources/mapper/app/AppGoodsMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/app/AppGoodsMapper.xml @@ -15,10 +15,12 @@ + + - select id, goods_id, goods_name, goods_unit, goods_type, normal_vehicle_type, goods_status, remark, last_update_user, last_update_time from app_goods + select id, goods_id, goods_name, goods_unit, goods_type, normal_vehicle_type, goods_status, remark, last_update_user, last_update_time,goods_desc,goods_code from app_goods - + - \ No newline at end of file + diff --git a/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderInMapper.xml b/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderInMapper.xml index 0e853bf1..44e9e13c 100644 --- a/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderInMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderInMapper.xml @@ -5,6 +5,8 @@ + + @@ -22,6 +24,7 @@ + @@ -46,7 +49,7 @@ - select list_id, order_type, customer_id, order_id, goods_id, goods_num, used_num, remaining_num, goods_code, goods_desc, unit, spare1, spare2, order_status, create_time, update_time, remark from app_pms_order_in + select id,list_id, order_type, customer_id, order_id, goods_id, goods_num, used_num, remaining_num, goods_code, goods_desc, unit, spare1, spare2, order_status, create_time, update_time, remark,create_by from app_pms_order_in - - where list_id = #{listId} + where id = #{id} - -