#杰克缝纫机立库 【手动修改订单】 - 1

luxiaotao1123

2022-03-24 157e6e40348f7605761460bbcf56d3aba9c0c022

#杰克缝纫机立库 【手动修改订单】 - 1

 src/main/java/com/zy/asrs/controller/OrderController.java

@@ -1,6 +1,5 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -10,7 +9,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.param.InitOrderParam;
import com.zy.asrs.entity.param.OrderDomainParam;
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.OrderService;
import com.zy.common.web.BaseController;
@@ -54,9 +53,9 @@
    }

    @RequestMapping(value = "/order/form/add/auth")
    @ManagerAuth
    @ManagerAuth(memo = "手动添加订单")
    @Transactional
    public R formAdd(@RequestBody InitOrderParam param){
    public R formAdd(@RequestBody OrderDomainParam param){
        Order order = orderService.selectByNo(param.getOrderNo());
        if (order != null) {
            return R.error("单据编号已存在");
@@ -116,15 +115,40 @@
    }

    @RequestMapping(value = "/order/form/modify/auth")
    @ManagerAuth
    public R formModify(@RequestBody InitOrderParam param){
        System.out.println(JSON.toJSONString(param));
    @ManagerAuth(memo = "手动修改订单")
    @Transactional
    public R formModify(@RequestBody OrderDomainParam param){
        Order order = orderService.selectById(param.getOrderId());
        if (order == null || order.getStatus() == 0) {
            return R.error("订单不存在");
        }
        // 修改主档
        if (!param.getDocType().equals(order.getDocType())) {
            order.setDocType(param.getDocType());
            order.setUpdateBy(getUserId());
            order.setUpdateTime(new Date());
            if (!orderService.updateById(order)) {
                throw new CoolException("修改订单类型失败");
            }
        }
        // 修改明细档
        Iterator<OrderDetl> iterator = param.getOrderDetlList().iterator();
        while (iterator.hasNext()) {
            OrderDetl orderDetl = iterator.next();
            OrderDetl detl = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
            // 新增
            if (detl == null) {

            // 修改
            } else {

            }
        }

        List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());

        return R.ok();
    }







@@ -166,25 +190,8 @@
        }
    }

    @RequestMapping(value = "/order/add/auth")
    @ManagerAuth
    public R add(Order order) {
        orderService.insert(order);
        return R.ok();
    }

    @RequestMapping(value = "/order/update/auth")
    @ManagerAuth
    public R update(Order order){
        if (Cools.isEmpty(order) || null==order.getId()){
            return R.error();
        }
        orderService.updateById(order);
        return R.ok();
    }

    @RequestMapping(value = "/order/delete/auth")
    @ManagerAuth
    @ManagerAuth(memo = "手动删除订单")
    public R delete(@RequestParam Long orderId){
        Order order = orderService.selectById(orderId);
        if (order != null) {
@@ -217,7 +224,7 @@
        for (Order order : page.getRecords()){
            Map<String, Object> map = new HashMap<>();
            map.put("id", order.getId());
            map.put("value", order.getId());
            map.put("value", order.getOrderNo());
            result.add(map);
        }
        return R.ok(result);

 src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java

File was renamed from src/main/java/com/zy/asrs/entity/param/InitOrderParam.java
@@ -9,7 +9,9 @@
 * Created by vincent on 2022/3/24
 */
@Data
public class InitOrderParam {
public class OrderDomainParam {

    private Long orderId;

    private Long docType;


 src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java

@@ -3,10 +3,13 @@
import com.zy.asrs.entity.OrderDetl;
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 OrderDetlMapper extends BaseMapper<OrderDetl> {

    OrderDetl selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch);

}

 src/main/java/com/zy/asrs/service/OrderDetlService.java

@@ -9,4 +9,6 @@

    List<OrderDetl> selectByOrderId(Long orderId);

    OrderDetl selectItem(Long orderId, String matnr, String batch);

}

 src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java

@@ -16,4 +16,9 @@
    public List<OrderDetl> selectByOrderId(Long orderId) {
        return this.selectList(new EntityWrapper<OrderDetl>().eq("order_id", orderId));
    }

    @Override
    public OrderDetl selectItem(Long orderId, String matnr, String batch) {
        return this.baseMapper.selectItem(orderId, matnr, batch);
    }
}

 src/main/resources/mapper/OrderDetlMapper.xml

@@ -29,4 +29,14 @@

    </resultMap>

    <select id="selectItem" resultMap="BaseResultMap">
        select * from man_order_detl
        where 1=1
        and order_id = #{orderId}
        and matnr = #{matnr}
        <if test="batch != null and batch != ''">
            and batch = #{batch}
        </if>
    </select>

</mapper>

 src/main/webapp/static/js/order/order.js

@@ -189,6 +189,7 @@
                        url: baseUrl+"/order/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,
                            orderDetlList: nList

 src/main/webapp/views/order/order.html

@@ -72,7 +72,7 @@
<!-- 表单弹窗 -->
<script type="text/html" id="editDialog">
    <form id="editForm" lay-filter="editForm" class="layui-form model-form">
        <input name="experimentTypeId" type="hidden"/>
        <input name="id" type="hidden"/>
        <div class="layui-form-item">
            <label class="layui-form-label">单据类型：</label>
            <div class="layui-input-block cool-auto-complete">