订单

src/main/java/com/dk/mdm/controller/common/CommonController.java

@@ -44,14 +44,14 @@ public class CommonController extends BaseController<Map<String, Object>> {
             notes = "获取数据字典项目"
     )
     @PostMapping("get_dictionary_item_data")
-    public  ResponseResultVO<List<Map<String, Object>>> getDictionaryItemData(@RequestBody Map<String, Object> param) {
+    public ResponseResultVO<List<Map<String, Object>>> getDictionaryItemData(@RequestBody Map<String, Object> param) {
         return commonService.getDictionaryItemData(param);
     }
 
     /**
-     * @desc   : 刷新基础数据
+     * @desc : 刷新基础数据
      * @author : 周兴
-     * @date   : 2023/5/11 10:20
+     * @date : 2023/5/11 10:20
      */
     @ApiOperation(
             value = "刷新基础数据",
@@ -398,9 +398,9 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 查询产品ERP物料
+     * @desc : 查询产品ERP物料
      * @author : 洪旭东
-     * @date   : 2023-05-12 13:48
+     * @date : 2023-05-12 13:48
      */
     @ApiOperation(
             value = "查询产品ERP物料",
@@ -707,9 +707,9 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 查询成型产品型号
+     * @desc : 查询成型产品型号
      * @author : 洪旭东
-     * @date   : 2023-04-19 13:01
+     * @date : 2023-04-19 13:01
      */
     @ApiOperation(value = "查询成型产品型号", notes = "查询成型产品型号")
     @PostMapping({"get_product_model"})
@@ -1013,8 +1013,8 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取员工用于报工记录查询
-     * @date   : 2023/4/17 15:06
+     * @desc : 获取员工用于报工记录查询
+     * @date : 2023/4/17 15:06
      * @author : 寇珊珊
      */
     @ApiOperation(value = "获取员工用于报工记录查询", notes = "获取员工用于报工记录查询")
@@ -1024,31 +1024,31 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 查询标签分类的类型
+     * @desc : 查询标签分类的类型
      * @author : 洪旭东
-     * @date   : 2023-05-08 17:03
+     * @date : 2023-05-08 17:03
      */
     @ApiOperation(value = "查询标签分类的类型", notes = "查询标签分类的类型")
     @PostMapping({"get_label_print_type_kind"})
-    public ResponseResultVO<List<Map<String,Object>>> getLabelPrintTypeKind(){
+    public ResponseResultVO<List<Map<String, Object>>> getLabelPrintTypeKind() {
         return commonService.getLabelPrintTypeKind();
     }
 
     /**
-     * @desc   : 查询产品型号标签
+     * @desc : 查询产品型号标签
      * @author : 洪旭东
-     * @date   : 2023-05-11 15:00
+     * @date : 2023-05-11 15:00
      */
     @ApiOperation(value = "查询产品型号标签", notes = "查询产品型号标签")
     @PostMapping({"get_model_product_label_type"})
-    public ResponseResultVO<List<Map<String,Object>>> getModelProductLabelType(){
+    public ResponseResultVO<List<Map<String, Object>>> getModelProductLabelType() {
         return commonService.getModelProductLabelType();
     }
 
     /**
-     * @desc   : 获取窑炉类型
+     * @desc : 获取窑炉类型
      * @author : 洪旭东
-     * @date   : 2023-05-19 10:38
+     * @date : 2023-05-19 10:38
      */
     @ApiOperation(
             value = "获取窑炉类型",
@@ -1060,23 +1060,23 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取成型线类型
+     * @desc : 获取成型线类型
      * @author : 洪旭东
-     * @date   : 2023-05-19 10:38
+     * @date : 2023-05-19 10:38
      */
     @ApiOperation(
             value = "获取成型线类型",
             notes = "获取成型线类型"
     )
     @PostMapping("get_moldline_type")
-    public ResponseResultVO<List<Map<String,Object>>> getMoldlineType(@RequestBody Map<String, Object> param){
+    public ResponseResultVO<List<Map<String, Object>>> getMoldlineType(@RequestBody Map<String, Object> param) {
         return commonService.getMoldlineType(param);
     }
 
 
     /**
-     * @desc   : 获取物料编码
-     * @date   : 2023/5/24 13:59
+     * @desc : 获取物料编码
+     * @date : 2023/5/24 13:59
      * @author : 寇珊珊
      */
     @ApiOperation(value = "获取物料编码分页查询", notes = "获取物料编码分页查询")
@@ -1086,8 +1086,8 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取物料编码
-     * @date   : 2023/6/30 9:10
+     * @desc : 获取物料编码
+     * @date : 2023/6/30 9:10
      * @author : 寇珊珊
      */
     @ApiOperation(value = "获取物料编码", notes = "获取物料编码")
@@ -1097,8 +1097,8 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 产品信息数量
-     * @date   : 2023/5/26 13:47
+     * @desc : 产品信息数量
+     * @date : 2023/5/26 13:47
      * @author : 寇珊珊
      */
     @ApiOperation(value = "产品信息数量", notes = "产品信息数量")
@@ -1108,9 +1108,9 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取数据类型
+     * @desc : 获取数据类型
      * @author : 周兴
-     * @date   : 2023/6/2 11:02
+     * @date : 2023/6/2 11:02
      */
     @ApiOperation(value = "获取数据类型", notes = "获取数据类型")
     @PostMapping({"get_value_kind"})
@@ -1119,20 +1119,20 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取计量单位
+     * @desc : 获取计量单位
      * @author : 常皓宁
-     * @date   : 2023/6/15 8:44
+     * @date : 2023/6/15 8:44
      */
-    @ApiOperation(value = "获取计量单位" , notes = "获取计量单位")
+    @ApiOperation(value = "获取计量单位", notes = "获取计量单位")
     @PostMapping({"get_model_units"})
-    public ResponseResultVO<List<Map<String , Object>>> getModelUnits(@RequestBody Map<String , Object> param){
+    public ResponseResultVO<List<Map<String, Object>>> getModelUnits(@RequestBody Map<String, Object> param) {
         return commonService.getModelUnits(param);
     }
 
     /**
-     * @desc   : 获取产品型号、物料型号
+     * @desc : 获取产品型号、物料型号
      * @author : 常皓宁
-     * @date   : 2023/6/15 13:37
+     * @date : 2023/6/15 13:37
      */
     @ApiOperation(value = "获取产品型号、物料型号", notes = "获取产品型号、物料型号")
     @PostMapping({"get_model_base"})
@@ -1141,9 +1141,9 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取产品型号、物料型号分页
+     * @desc : 获取产品型号、物料型号分页
      * @author : 常皓宁
-     * @date   : 2023/6/15 13:37
+     * @date : 2023/6/15 13:37
      */
     @ApiOperation(value = "获取产品型号、物料型号分页", notes = "获取产品型号、物料型号分页")
     @PostMapping({"get_model_base_by_page"})
@@ -1174,9 +1174,9 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 查询产品缺陷
+     * @desc : 查询产品缺陷
      * @author : 常皓宁
-     * @date   : 2023/6/25 10:05
+     * @date : 2023/6/25 10:05
      */
     @ApiOperation(
             value = "查询产品缺陷",
@@ -1190,7 +1190,7 @@ public class CommonController extends BaseController<Map<String, Object>> {
     /**
      * @desc : 查询产品缺陷
      * @author : 常皓宁
-     * @date   : 2023/6/25 10:05
+     * @date : 2023/6/25 10:05
      */
     @ApiOperation(
             value = "查询产品缺陷",
@@ -1202,9 +1202,9 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取应用
+     * @desc : 获取应用
      * @author : 洪旭东
-     * @date   : 2023-06-30 14:56
+     * @date : 2023-06-30 14:56
      */
     @ApiOperation(
             value = "获取应用",
@@ -1236,9 +1236,9 @@ public class CommonController extends BaseController<Map<String, Object>> {
 
 
     /**
-     * @desc   : 获取仓库
+     * @desc : 获取仓库
      * @author : 洪旭东
-     * @date   : 2023-08-09 14:32
+     * @date : 2023-08-09 14:32
      */
     @ApiOperation(
             value = "获取仓库",
@@ -1251,9 +1251,9 @@ public class CommonController extends BaseController<Map<String, Object>> {
 
 
     /**
-     * @desc   : 获取仓位
+     * @desc : 获取仓位
      * @author : 洪旭东
-     * @date   : 2023-08-09 14:32
+     * @date : 2023-08-09 14:32
      */
     @ApiOperation(
             value = "获取仓位",
@@ -1265,9 +1265,9 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取单据
+     * @desc : 获取单据
      * @author : 周兴
-     * @date   : 2023-08-09 14:32
+     * @date : 2023-08-09 14:32
      */
     @ApiOperation(
             value = "获取单据",
@@ -1279,9 +1279,9 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取下拉选
+     * @desc : 获取下拉选
      * @author : 洪旭东
-     * @date   : 2023-09-25 09:03
+     * @date : 2023-09-25 09:03
      */
     @ApiOperation(
             value = "获取下拉选",
@@ -1294,9 +1294,9 @@ public class CommonController extends BaseController<Map<String, Object>> {
 
 
     /**
-     * @desc   : 获取放大镜
+     * @desc : 获取放大镜
      * @author : 洪旭东
-     * @date   : 2023-09-25 09:03
+     * @date : 2023-09-25 09:03
      */
     @ApiOperation(
             value = "获取放大镜",
@@ -1308,9 +1308,9 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取理化检验单
+     * @desc : 获取理化检验单
      * @author : 洪旭东
-     * @date   : 2023-12-01 16:40
+     * @date : 2023-12-01 16:40
      */
     @ApiOperation(
             value = "获取理化检验单",
@@ -1322,9 +1322,9 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取生产工单
+     * @desc : 获取生产工单
      * @author : 洪旭东
-     * @date   : 2023-12-25 11:00
+     * @date : 2023-12-25 11:00
      */
     @ApiOperation(
             value = "获取生产工单",
@@ -1336,9 +1336,9 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取载具型号分页查询
+     * @desc : 获取载具型号分页查询
      * @author : 姜宁
-     * @date   : 2024/1/3 10:55
+     * @date : 2024/1/3 10:55
      */
     @ApiOperation(
             value = "获取载具型号",
@@ -1373,6 +1373,31 @@ public class CommonController extends BaseController<Map<String, Object>> {
     public ResponseResultVO<PageList<Map<String, Object>>> getGoodsPage(@RequestBody Map<String, Object> param) {
         return commonService.getGoodsPage(param);
     }
+
+    /**
+     * @desc : 获取商品
+     * @author : 姜宁
+     * @date : 2023/1/9 13:50
+     */
+    @ApiOperation(
+            value = "获取商品",
+            notes = "获取商品"
+    )
+    @PostMapping("get_customer")
+    public ResponseResultVO<List<Map<String, Object>>> getCustomer(@RequestBody Map<String, Object> param) {
+        return commonService.getCustomer(param);
+    }
+
+    /**
+     * @desc : 获取商品（分页）
+     * @author : 姜宁
+     * @date : 2023/1/29 16:52
+     */
+    @ApiOperation(value = "获取商品分页查询", notes = "获取商品分页查询")
+    @PostMapping({"get_customer_by_page"})
+    public ResponseResultVO<PageList<Map<String, Object>>> GetCustomerByPage(@RequestBody Map<String, Object> param) {
+        return commonService.GetCustomerByPage(param);
+    }
 }
 
 

src/main/java/com/dk/mdm/controller/sale/OrderController.java

@@ -76,8 +76,8 @@ public class OrderController {
      * @date : 2023/1/9 10:49
      */
     @ApiOperation(value = "编辑订单", notes = "编辑订单")
-    @PostMapping({"update"})
-    public ResponseResultVO<Boolean> update(@RequestBody OrderVO orderVO) {
-        return orderService.update(orderVO);
+    @PostMapping({"update_order"})
+    public ResponseResultVO<Boolean> updateOrder(@RequestBody OrderVO orderVO) {
+        return orderService.updateOrder(orderVO);
     }
 }

src/main/java/com/dk/mdm/mapper/common/CommonMapper.java

@@ -918,4 +918,17 @@ public interface CommonMapper extends BaseMapper<Map<String, Object>> {
      * @date : 2023/1/29 17:04
      */
     Long getGoodsCountByPage(Map param);
+    /**
+     * @desc : 获取商品
+     * @author : 姜宁
+     * @date : 2023/1/9 13:49
+     */
+    List<Map<String, Object>> getCustomer(Map param);
+
+    /**
+     * @desc : 获取商品（数量）
+     * @author : 姜宁
+     * @date : 2023/1/29 17:04
+     */
+    Long getCustomerCountByPage(Map param);
 }

src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -2814,4 +2814,64 @@
             AND tmgs.sku_name != #{skuName}
         </if>
     </select>
+
+    <!-- 获取商品 -->
+    <select id="getCustomer" resultType="java.util.Map">
+        select tmc.cus_id             as "cusId",
+               tmc.cus_code           as "cusCode",
+               tmc.cus_name           as "cusName",
+               tmc.cus_phone          as "cusPhone",
+               tmc.address_area       as "addressArea",
+               tmc.address_name       as "addressName",
+               tmc.address_no         as "addressNo",
+               tmc.address_gcj02      as "addressGcj02",
+               tmc.address_full       as "addressFull",
+               tmc.contact_name       as "contactName",
+               tmc.contact_phone      as "contactPhone",
+               tmc.cus_from           as "cusFrom",
+               tmdd.data_value        as "cusFromName",
+               tmc.channel_id         as "channelId",
+               tmsc.channel_name      as "channelName",
+               tmc.org_id             as "orgId",
+               tmo.org_name           as "orgName",
+               tmc.staff_id           as "staffId",
+               tms.staff_name         as "staffName",
+               tmc.report_staff       as "reportStaff",
+               reportstaff.staff_name as "reportStaffName",
+               tmc.report_time        as "reportTime",
+               tmc.sale_status        as "saleStatus",
+               tmc.remarks            as "remarks",
+               tmc.follow_staffs      as "followStaffs",
+               tmc.last_follow_staff  as "lastFollowStaff",
+               tmc.last_follow_id     as "lastFollowId",
+               tmc.last_follow_status as "lastFollowStatus",
+               tmc.last_follow_time   as "lastFollowTime"
+        from dkic_b.t_mst_customer as tmc
+                 inner join dkic_b.t_mst_org tmo on tmc.org_id = tmo.org_id
+                 inner join dkic_b.t_mst_staff tms on tmc.staff_id = tms.staff_id
+                 inner join dkic_b.t_mst_staff as reportstaff on tmc.report_staff = reportstaff.staff_id
+                 inner join dkic_b.t_mst_sale_channel tmsc on tmc.channel_id = tmsc.channel_id
+                 left join dkic_b.t_mst_dictionary_data tmdd on tmc.cus_from = tmdd.data_id
+        where tmc.flg_valid
+        <if test="skuCode != null">
+            AND tmc.cus_code = #{cusCode}
+        </if>
+        <if test="skuName != null">
+            AND tmc.cus_name != #{cusName}
+        </if>
+    </select>
+
+    <!-- 获取商品个数 -->
+    <select id="getCustomerCountByPage" resultType="Long">
+        SELECT
+        count(1)
+        from dkic_b.t_mst_customer as tmc
+        where tmc.flg_valid
+        <if test="skuCode != null">
+            AND tmc.cus_code = #{cusCode}
+        </if>
+        <if test="skuName != null">
+            AND tmc.cus_name != #{cusName}
+        </if>
+    </select>
 </mapper>

src/main/java/com/dk/mdm/service/common/CommonService.java

@@ -52,13 +52,13 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 刷新基础数据
+     * @desc : 刷新基础数据
      * @author : 周兴
-     * @date   : 2023/5/11 10:19
+     * @date : 2023/5/11 10:19
      */
-    public ResponseResultVO refreshBasicData(Map<String, Object> param){
+    public ResponseResultVO refreshBasicData(Map<String, Object> param) {
         UserVO user = authUtils.getUser();
-        if(param.get("appCode") != null ){
+        if (param.get("appCode") != null) {
             user.setAppCode(param.get("appCode").toString());
         }
         Map userMap = new HashMap();
@@ -66,7 +66,7 @@ public class CommonService extends BaseService<Map<String, Object>> {
         userMap.put("appCode", user.getAppCode());
         return ResponseResultUtil.success(new HashMap<String, Object>(3) {{
             put("menu", commonMapper.getMenuByUser(user.getAppCode(), user.getUserId()));
-            put("function",(user.getRoleIds() != null && user.getRoleIds().indexOf(-1) >= 0)
+            put("function", (user.getRoleIds() != null && user.getRoleIds().indexOf(-1) >= 0)
                     ? commonMapper.getUserFunctionAdmin(userMap) : commonMapper.getUserFunction(userMap));
             put("userTableSetting", commonMapper.getUserTableInfo(userMap));
         }});
@@ -394,9 +394,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 查询产品ERP物料
+     * @desc : 查询产品ERP物料
      * @author : 洪旭东
-     * @date   : 2023-05-12 13:48
+     * @date : 2023-05-12 13:48
      */
     public ResponseResultVO<List<Map<String, Object>>> getProductErpSku(Map<String, Object> param) {
         List<Map<String, Object>> list = commonMapper.getProductErpSku(param);
@@ -700,9 +700,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 查询成型产品型号
+     * @desc : 查询成型产品型号
      * @author : 洪旭东
-     * @date   : 2023-04-19 13:00
+     * @date : 2023-04-19 13:00
      */
     public ResponseResultVO<PageList<Map<String, Object>>> getProductModel(Map<String, Object> param) {
         // 校验分页参数
@@ -995,8 +995,8 @@ public class CommonService extends BaseService<Map<String, Object>> {
 
 
     /**
-     * @desc   : 获取员工用于报工记录查询
-     * @date   : 2023/4/17 15:07
+     * @desc : 获取员工用于报工记录查询
+     * @date : 2023/4/17 15:07
      * @author : 寇珊珊
      */
     public ResponseResultVO<PageList<Map<String, Object>>> getStaffWithWork(Map<String, Object> param) {
@@ -1011,44 +1011,44 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 查询标签分类的类型
+     * @desc : 查询标签分类的类型
      * @author : 洪旭东
-     * @date   : 2023-05-08 17:03
+     * @date : 2023-05-08 17:03
      */
-    public ResponseResultVO<List<Map<String,Object>>> getLabelPrintTypeKind(){
+    public ResponseResultVO<List<Map<String, Object>>> getLabelPrintTypeKind() {
         return ResponseResultUtil.success(commonMapper.getLabelPrintTypeKind(new HashMap<>()));
     }
 
     /**
-     * @desc   : 查询产品型号标签
+     * @desc : 查询产品型号标签
      * @author : 洪旭东
-     * @date   : 2023-05-11 15:00
+     * @date : 2023-05-11 15:00
      */
-    public ResponseResultVO<List<Map<String,Object>>> getModelProductLabelType(){
+    public ResponseResultVO<List<Map<String, Object>>> getModelProductLabelType() {
         return ResponseResultUtil.success(commonMapper.getModelProductLabelType(new HashMap<>()));
     }
 
     /**
-     * @desc   : 获取窑炉类型
+     * @desc : 获取窑炉类型
      * @author : 洪旭东
-     * @date   : 2023-05-19 10:38
+     * @date : 2023-05-19 10:38
      */
-    public ResponseResultVO<List<Map<String,Object>>> getKilnType(Map<String, Object> param){
+    public ResponseResultVO<List<Map<String, Object>>> getKilnType(Map<String, Object> param) {
         return ResponseResultUtil.success(commonMapper.getKilnType(param));
     }
 
     /**
-     * @desc   : 获取成型线类型
+     * @desc : 获取成型线类型
      * @author : 洪旭东
-     * @date   : 2023-05-19 10:38
+     * @date : 2023-05-19 10:38
      */
-    public ResponseResultVO<List<Map<String,Object>>> getMoldlineType(Map<String, Object> param){
+    public ResponseResultVO<List<Map<String, Object>>> getMoldlineType(Map<String, Object> param) {
         return ResponseResultUtil.success(commonMapper.getMoldlineType(param));
     }
 
     /**
-     * @desc   : 获取物料编码
-     * @date   : 2023/5/24 14:05
+     * @desc : 获取物料编码
+     * @date : 2023/5/24 14:05
      * @author : 寇珊珊
      */
     public ResponseResultVO<PageList<Map<String, Object>>> getModelMaterialByPage(Map<String, Object> param) {
@@ -1063,18 +1063,18 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取物料编码
-     * @date   : 2023/6/30 9:51
+     * @desc : 获取物料编码
+     * @date : 2023/6/30 9:51
      * @author : 寇珊珊
      */
     public ResponseResultVO<List<Map<String, Object>>> getModelMaterial(Map<String, Object> param) {
         return ResponseResultUtil.success(commonMapper.getModelMaterial(param));
     }
-    
-    
+
+
     /**
-     * @desc   : 产品信息数量
-     * @date   : 2023/5/26 13:48
+     * @desc : 产品信息数量
+     * @date : 2023/5/26 13:48
      * @author : 寇珊珊
      */
     public ResponseResultVO<List<Map<String, Object>>> getProductForChangeNoPage(Map<String, Object> param) {
@@ -1082,36 +1082,36 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取数据类型
+     * @desc : 获取数据类型
      * @author : 周兴
-     * @date   : 2023/6/2 11:01
+     * @date : 2023/6/2 11:01
      */
     public ResponseResultVO<List<Map<String, Object>>> getValueKind(Map<String, Object> param) {
         return ResponseResultUtil.success(commonMapper.getValueKind(param));
     }
 
     /**
-     * @desc   : 获取计量单位
+     * @desc : 获取计量单位
      * @author : 常皓宁
-     * @date   : 2023/6/15 8:46
+     * @date : 2023/6/15 8:46
      */
-    public ResponseResultVO<List<Map<String , Object>>> getModelUnits(Map<String , Object> param){
+    public ResponseResultVO<List<Map<String, Object>>> getModelUnits(Map<String, Object> param) {
         return ResponseResultUtil.success(commonMapper.getModelUnits(param));
     }
 
     /**
-     * @desc   : 获取产品型号、物料型号
+     * @desc : 获取产品型号、物料型号
      * @author : 常皓宁
-     * @date   : 2023/6/15 13:37
+     * @date : 2023/6/15 13:37
      */
     public ResponseResultVO<List<Map<String, Object>>> getModelBase(Map<String, Object> param) {
         return ResponseResultUtil.success(commonMapper.getModelBase(param));
     }
 
     /**
-     * @desc   : 获取产品型号、物料型号分页
+     * @desc : 获取产品型号、物料型号分页
      * @author : 常皓宁
-     * @date   : 2023/6/15 13:37
+     * @date : 2023/6/15 13:37
      */
     public ResponseResultVO<PageList<Map<String, Object>>> getModelBaseByPage(Map<String, Object> param) {
         this.getLimit(param);
@@ -1147,9 +1147,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 查询产品缺陷
+     * @desc : 查询产品缺陷
      * @author : 常皓宁
-     * @date   : 2023/6/25 10:05
+     * @date : 2023/6/25 10:05
      */
     public ResponseResultVO<PageList<Map<String, Object>>> getProductDefectsByPage(Map<String, Object> param) {
         this.getLimit(param);
@@ -1158,27 +1158,27 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 查询产品缺陷
+     * @desc : 查询产品缺陷
      * @author : 常皓宁
-     * @date   : 2023/6/25 10:05
+     * @date : 2023/6/25 10:05
      */
     public ResponseResultVO<List<Map<String, Object>>> getProductDefects(Map<String, Object> param) {
         return ResponseResultUtil.success(commonMapper.getProductDefects(param));
     }
 
     /**
-     * @desc   : 获取应用
+     * @desc : 获取应用
      * @author : 洪旭东
-     * @date   : 2023-06-30 14:56
+     * @date : 2023-06-30 14:56
      */
     public ResponseResultVO<List<Map<String, String>>> getApplication() {
         return ResponseResultUtil.success(commonMapper.getApplication());
     }
-    
-    
+
+
     /**
-     * @desc   : 获取产品
-     * @date   : 2023/7/14 14:44
+     * @desc : 获取产品
+     * @date : 2023/7/14 14:44
      * @author : 寇珊珊
      */
     public ResponseResultVO<Map<String, String>> getProduct(Map<String, Object> param) {
@@ -1187,8 +1187,8 @@ public class CommonService extends BaseService<Map<String, Object>> {
 
 
     /**
-     * @desc   : 获取工位打印机
-     * @date   : 2023/7/14 14:44
+     * @desc : 获取工位打印机
+     * @date : 2023/7/14 14:44
      * @author : 寇珊珊
      */
     public ResponseResultVO<List<Map<String, String>>> getWsPrinter(Map<String, Object> param) {
@@ -1197,9 +1197,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
 
 
     /**
-     * @desc   : 获取仓库
+     * @desc : 获取仓库
      * @author : 洪旭东
-     * @date   : 2023-08-09 14:31
+     * @date : 2023-08-09 14:31
      */
     public ResponseResultVO<PageList<Map<String, Object>>> getWarehouseByPage(Map<String, Object> param) {
         this.getLimit(param);
@@ -1208,9 +1208,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取仓位
+     * @desc : 获取仓位
      * @author : 洪旭东
-     * @date   : 2023-08-09 14:31
+     * @date : 2023-08-09 14:31
      */
     public ResponseResultVO<PageList<Map<String, Object>>> getWarehousePlaceByPage(Map<String, Object> param) {
         this.getLimit(param);
@@ -1219,18 +1219,18 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取单据
+     * @desc : 获取单据
      * @author : 周兴
-     * @date   : 2023/9/14 11:06
+     * @date : 2023/9/14 11:06
      */
     public ResponseResultVO<List<Map<String, Object>>> getDoc(Map<String, Object> param) {
         return ResponseResultUtil.success(commonMapper.getDoc(param));
     }
 
     /**
-     * @desc   : 获取下拉选
+     * @desc : 获取下拉选
      * @author : 洪旭东
-     * @date   : 2023-09-25 09:03
+     * @date : 2023-09-25 09:03
      */
     public ResponseResultVO<List<Map<String, Object>>> getSelectType(Map<String, Object> param) {
         return ResponseResultUtil.success(commonMapper.getSelectType(param));
@@ -1238,18 +1238,18 @@ public class CommonService extends BaseService<Map<String, Object>> {
 
 
     /**
-     * @desc   : 获取放大镜
+     * @desc : 获取放大镜
      * @author : 洪旭东
-     * @date   : 2023-09-25 09:03
+     * @date : 2023-09-25 09:03
      */
     public ResponseResultVO<List<Map<String, Object>>> getSelectMagnifier(Map<String, Object> param) {
         return ResponseResultUtil.success(commonMapper.getSelectMagnifier(param));
     }
 
     /**
-     * @desc   : 获取理化检验单
+     * @desc : 获取理化检验单
      * @author : 洪旭东
-     * @date   : 2023-12-01 16:39
+     * @date : 2023-12-01 16:39
      */
     public ResponseResultVO<PageList<Map<String, Object>>> getPhysicalCollectByPage(Map<String, Object> param) {
         this.getLimit(param);
@@ -1258,9 +1258,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取生产工单
+     * @desc : 获取生产工单
      * @author : 洪旭东
-     * @date   : 2023-12-25 10:59
+     * @date : 2023-12-25 10:59
      */
     public ResponseResultVO<PageList<Map<String, Object>>> getSheetProduceByPage(Map<String, Object> param) {
         this.getLimit(param);
@@ -1269,9 +1269,9 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
-     * @desc   : 获取载具型号分页查询
+     * @desc : 获取载具型号分页查询
      * @author : 姜宁
-     * @date   : 2024/1/3 10:53
+     * @date : 2024/1/3 10:53
      */
     public ResponseResultVO<PageList<Map<String, Object>>> getModelCarrierByPage(Map<String, Object> param) {
         this.getLimit(param);
@@ -1305,4 +1305,31 @@ public class CommonService extends BaseService<Map<String, Object>> {
         return super.mergeListWithCount(param, commonMapper.getGoods(param),
                 commonMapper.getGoodsCountByPage(param));
     }
+
+    /**
+     * @desc : 获取商品
+     * @author : 姜宁
+     * @date : 2023/1/9 13:50
+     */
+    public ResponseResultVO<List<Map<String, Object>>> getCustomer(Map<String, Object> param) {
+        // 获取系统基础数据
+        List<Map<String, Object>> list = commonMapper.getCustomer(param);
+        return ResponseResultUtil.success(list);
+    }
+
+    /**
+     * @desc : 获取商品数量
+     * @author : 姜宁
+     * @date : 2023/1/29 17:01
+     */
+    public ResponseResultVO<PageList<Map<String, Object>>> GetCustomerByPage(Map<String, Object> param) {
+        // 校验分页参数
+        if (param.get("pageSize") == null || param.get("currentPage") == null) {
+            return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL, "请检查分页参数!");
+        }
+        // 分页参数赋值
+        param = this.getLimit(param);
+        return super.mergeListWithCount(param, commonMapper.getCustomer(param),
+                commonMapper.getCustomerCountByPage(param));
+    }
 }

src/main/java/com/dk/mdm/service/sale/OrderService.java

@@ -120,7 +120,7 @@ public class OrderService extends BaseService<Order> {
     @Transactional(
             rollbackFor = {Exception.class}
     )
-    public ResponseResultVO<Boolean> update(OrderVO orderVO) {
+    public ResponseResultVO<Boolean> updateOrder(OrderVO orderVO) {
         // 转化实体
         Order order = orderConvert.convertToPo(orderVO);
         return ResponseResultUtil.success(super.update(order, new UpdateWrapper<Order>().lambda().eq(Order::getOrderId,