Merge remote-tracking branch 'origin/stasrs_test' into stasrs_test

zjj

2023-06-28 f212c8f3c70623167dbf786ce407eef53101ca11

Merge remote-tracking branch 'origin/stasrs_test' into stasrs_test

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

@@ -360,4 +360,13 @@
        return mobileService.manDetlOut(json , getUser());
    }

    @RequestMapping("/manDetl/in/barcode")
    @ManagerAuth(memo = "订单上架(托盘码)")
    public R manDetlAddbarcode(@RequestBody JSONObject json){
        if (json == null){
            return R.error("传入数据为空");
        }
        return mobileService.manDetlInBarcode(json,getUser());
    }

}

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

@@ -9,6 +9,7 @@
import com.core.annotations.ManagerAuth;
import com.core.common.*;
import com.core.exception.CoolException;
import com.sun.org.apache.xpath.internal.operations.Or;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OrderDomainParam;
import com.zy.asrs.service.*;
@@ -411,4 +412,18 @@
                .doWrite(list);
    }

    @RequestMapping(value = "/order/list/all")
    public R orderList() {

        return R.ok(orderService.selectAllorderNo());
    }

    @RequestMapping(value = "/order/list/orderNo")
    public R orderListorderNo(@RequestParam String orderNo) {

        return R.ok(orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no",orderNo)));
    }



}

 src/main/java/com/zy/asrs/entity/OrderListDTO.java

New file
@@ -0,0 +1,8 @@
package com.zy.asrs.entity;

import lombok.Data;

@Data
public class OrderListDTO {
    private String order_no;
}

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

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderListDTO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@@ -26,4 +27,5 @@

    List<Order> selectToBeHistoryOrder(@Param("settle")int settle);

    List<OrderListDTO> selectAllorderNo();
}

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

@@ -44,4 +44,6 @@
    R manDetlIn(JSONObject json ,User user);

    R manDetlOut(JSONObject json,User user);
    R manDetlInBarcode(JSONObject json ,User user);

}

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

@@ -1,10 +1,7 @@
package com.zy.asrs.service;

import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.*;
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;

import java.util.List;

@@ -33,4 +30,6 @@
    void checkSettleUpdate(Long orderId);

    List<Order> selectToBeHistoryOrder(boolean isERP);

    List<OrderListDTO> selectAllorderNo();
}

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

@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.*;
import com.core.exception.CoolException;
import com.sun.org.apache.xpath.internal.operations.Or;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
@@ -81,6 +82,9 @@
    private ManLocDetlService manLocDetlService;
    @Autowired
    private ManLocDetlMapper manLocDetlMapper;
    @Autowired
    private WaitPakinLogService waitPakinLogService;



    @Override
@@ -738,4 +742,81 @@
        }
        return R.ok("下架完成");
    }

    @Override
    public R manDetlInBarcode(JSONObject json, User user) {
        String jsonLocNo = (String) json.get("locNo"); //获取库位码
        String jsonBarNo = (String) json.get("barcode"); //获取托盘码

        WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", jsonBarNo)); //获取对应组托信息
        if (waitPakin.equals(null)){
            return R.error("未查询到组托");
        } else if (waitPakin.getIoStatus() == "Y") {
            return R.error("组托已经生成工作档");
        }
        Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", waitPakin.getOrderNo()));  //获取对应订单信息
        if (order.equals(null)){
            return R.error("未查询到订单信息");
        }
        OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", waitPakin.
                getOrderNo()).eq("matnr", waitPakin.getMatnr()));  //获取对应订单明细信息
        if (orderDetl.equals(null)){
            return R.error("未查询到订单明细信息");
        }
        Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", jsonLocNo));  //获取对应库位信息
        if (node.equals(null)){
            return R.error("未查询到库位信息");
        }
        Date date = new Date();
        ManLocDetl manLocDetl = new ManLocDetl();  //初始化库存实体类
        manLocDetl.setLocNo(node.getName());
        manLocDetl.setNodeId(node.getId());
        manLocDetl.setZpallet(waitPakin.getZpallet());
        manLocDetl.setAnfme(waitPakin.getAnfme());
        manLocDetl.setMatnr(waitPakin.getMatnr());
        manLocDetl.setMaktx(waitPakin.getMaktx());
        manLocDetl.setStatus(1);
        manLocDetl.setCreateBy(user.getId());
        manLocDetl.setCreateTime(date);
        manLocDetl.setUpdateBy(user.getId());
        manLocDetl.setModiTime(date);
        manLocDetl.setOrderNo(waitPakin.getOrderNo());
        manLocDetl.setOwner(waitPakin.getOwner());
        manLocDetl.setPayment(waitPakin.getPayment());

        if (!manLocDetlService.insert(manLocDetl)){  //数据库插入实体类信息
            return R.error("物料信息入库失败");
        }
        orderDetl.setQty(orderDetl.getQty()+ waitPakin.getAnfme());  //更新订单明细数量
        if (!orderDetlService.updateById(orderDetl)){
            return R.error("更新订单明细失败");
        }

        WaitPakinLog waitPakinLog = new WaitPakinLog(); //初始化入库通知单日志实体类
        waitPakinLog.setZpallet(waitPakin.getZpallet());
        waitPakinLog.setAnfme(waitPakin.getAnfme());
        waitPakinLog.setMatnr(waitPakin.getMatnr());
        waitPakinLog.setLocNo(waitPakin.getLocNo());
        waitPakinLog.setMaktx(waitPakin.getMaktx());
        waitPakinLog.setOrderNo(waitPakin.getOrderNo());
        waitPakinLog.setWeight(waitPakin.getWeight());
        waitPakinLog.setStatus("Y");
        waitPakinLog.setIoStatus("Y");
        waitPakinLog.setModiUser(user.getId());
        waitPakinLog.setModiTime(date);
        waitPakinLog.setAppeUser(user.getId());
        waitPakinLog.setAppeTime(date);
        waitPakinLog.setOwner(waitPakin.getOwner());
        waitPakinLog.setPayment(waitPakin.getPayment());
        waitPakinLog.setUuid(waitPakin.getUuid());

        if (!waitPakinLogService.insert(waitPakinLog)){  //插入入库通知历史档数据库
            return R.error("插入历史入库通知档失败");
        }

        if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet",jsonBarNo))){  //删除原入库通知档
            return R.error("删除入库通知档失败");
        }
        return R.ok("上架成功");
    }
}

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

@@ -208,4 +208,9 @@
        return this.baseMapper.selectToBeHistoryOrder(settle);
    }

    @Override
    public List<OrderListDTO> selectAllorderNo() {
        return this.baseMapper.selectAllorderNo();
    }

}

 src/main/java/com/zy/common/CodeRes.java

@@ -13,4 +13,6 @@
    String PICK_600 = "600-拣料任务";
    String NO_COMB_700 = "700-请先组托";

    String USER_10004 = "10004-账号或密码错误";

}

 src/main/java/com/zy/common/web/AuthController.java

@@ -59,13 +59,13 @@
        userWrapper.eq("username", username);
        User user = userService.selectOne(userWrapper);
        if (Cools.isEmpty(user)){
            return R.parse(CodeRes.USER_10001);
            return R.parse(CodeRes.USER_10004);
        }
        if (user.getStatus()!=1){
            return R.parse(CodeRes.USER_10002);
            return R.parse(CodeRes.USER_10004);
        }
        if (!user.getPassword().equals(password)){
            return R.parse(CodeRes.USER_10003);
            return R.parse(CodeRes.USER_10004);
        }
        String token = Cools.enToken(System.currentTimeMillis() + username, user.getPassword());
        userLoginService.delete(new EntityWrapper<UserLogin>().eq("user_id", user.getId()));

 src/main/java/com/zy/system/controller/UserController.java

@@ -104,6 +104,15 @@
    @RequestMapping(value = "/user/update/auth")
    @ManagerAuth(memo = "系统用户修改")
    public R update(User user){
        if (getUserId() != 9527){
            if (!getUserId().equals(user.getId())){
                Role role = roleService.selectById(getUser().getRoleId());
                if (!role.getCode().equals("admin")){
                    return R.error("操作越权！");
                }
            }
        }

        if (Cools.isEmpty(user) || null==user.getId()){
            return R.error();
        }

 src/main/resources/mapper/ManLocDetlMapper.xml

@@ -52,6 +52,9 @@
        <if test="maktx != null and maktx != ''">
            and mld.maktx like concat('%',#{maktx},'%')
        </if>
        <if test="zpallet != null and zpallet != ''">
            and mld.zpallet like concat('%',#{zpallet},'%')
        </if>
        <if test="startTime!=null and endTime!=null">
            and mld.update_time between #{startTime} and #{endTime}
        </if>

 src/main/resources/mapper/OrderMapper.xml

@@ -78,6 +78,10 @@
          and settle = #{settle}
        order by create_time asc
    </select>
    <select id="selectAllorderNo" resultType="com.zy.asrs.entity.OrderListDTO">
        select order_no from man_order
    </select>


    <insert id="addToLogTable">
        INSERT INTO man_order_log SELECT * FROM man_order WHERE id = #{id}

 src/main/webapp/static/js/manLocDetl/manLocDetl.js

@@ -10,7 +10,7 @@

        ,{field: 'batch', align: 'center',title: '批号', width: 300, sort:true, hide: true}
        ,{field: 'anfme', align: 'center',title: '数量'}
        //,{field: 'zpallet', align: 'center',title: '托盘条码'}
        ,{field: 'zpallet', align: 'center',title: '托盘条码'}
        ,{field: 'model', align: 'center',title: '代码', hide: true}
        ,{field: 'color', align: 'center',title: '颜色', hide: true}
        ,{field: 'brand', align: 'center',title: '品牌', hide: true}

 src/main/webapp/views/login.html

@@ -121,6 +121,12 @@
        if (password === "") {
          layer.tips('请输入密码', '#password', {tips: [4, '#ff0000']});
          return;
        }else {
          if(!checkPassword(password)){
            //密码必须包含字符和数字
            layer.tips('密码必须包含字符和数字长度不能少于8位，且不能包含连续数字和四位重复数字', '#password', {tips: [4, '#ff0000']});
            return ;
          }
        }
        $.ajax({
          url: baseUrl+"/login.action",
@@ -135,13 +141,7 @@
              localStorage.setItem("username", res.data.username);
              localStorage.setItem("password", password);
              window.location.href = "index.html";
            } else if (res.code === 10001) {
              layer.tips(res.msg, '#username', {tips: [4, '#ff0000']});
            } else if (res.code === 10002) {
              layer.tips(res.msg, '#username', {tips: [4, '#ff0000']});
            } else if (res.code === 10003) {
              layer.tips(res.msg, '#password', {tips: [4, '#ff0000']});
            } else {
            }  else {
              layer.tips(res.msg, '.login-btn', {tips: [3, '#ff0000']});
            }
          }

 src/main/webapp/views/manLocDetl/manLocDetl.html

@@ -71,19 +71,25 @@
                        <div class="layui-inline">
                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">货位:</label>
                            <div class="layui-input-inline">
                                <input name="loc_no" class="layui-input" placeholder="输入货位"/>
                                <input name="loc_no" style="width: 120px" class="layui-input" placeholder="输入货位"/>
                            </div>
                        </div>
                        <div class="layui-inline">
                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">商品编号:</label>
                            <div class="layui-input-inline">
                                <input name="matnr" class="layui-input" placeholder="输入商品编号"/>
                                <input name="matnr" style="width: 120px" class="layui-input" placeholder="输入商品编号"/>
                            </div>
                        </div>
                        <div class="layui-inline">
                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">商品名称:</label>
                            <div class="layui-input-inline">
                                <input name="maktx" class="layui-input" placeholder="输入商品名称"/>
                                <input name="maktx" style="width: 120px" class="layui-input" placeholder="输入商品名称"/>
                            </div>
                        </div>
                        <div class="layui-inline">
                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">托盘码:</label>
                            <div class="layui-input-inline">
                                <input name="zpallet" style="width: 120px" class="layui-input" placeholder="输入托盘码"/>
                            </div>
                        </div>
                        <div class="layui-inline">&emsp;