#

mrzhssss

2022-03-21 0e174699453044ba39deefc5fbe8676207e63fe1

#

 src/main/java/zy/cloud/wms/common/service/MainService.java

@@ -437,6 +437,8 @@
            pickout.setUserId(userId);
            pickout.setWrkNo(String.valueOf(snowflakeIdWorker.nextId()));
            pickout.setWrkSts(1L);
            pickout.setOrderQty(1);
            pickout.setOrderNos(orderStoDto.getOrderNo());
            pickout.setCreateBy(userId.intValue());
            pickout.setUpdateBy(userId.intValue());
            pickoutService.insert(pickout);

 src/main/java/zy/cloud/wms/manager/controller/PakoutController.java

@@ -13,7 +13,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import zy.cloud.wms.common.web.BaseController;
import zy.cloud.wms.manager.entity.Order;
import zy.cloud.wms.manager.entity.Pakout;
import zy.cloud.wms.manager.service.OrderService;
import zy.cloud.wms.manager.service.PakoutService;

import java.util.ArrayList;
@@ -26,6 +28,8 @@

    @Autowired
    private PakoutService pakoutService;
    @Autowired
    private OrderService orderService;

    @RequestMapping(value = "/pakout/{id}/auth")
    @ManagerAuth
@@ -139,13 +143,18 @@
    @RequestMapping(value = "/pakout/print/auth")
    @ManagerAuth
    public R print(@RequestParam String docNumber) {
        List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", docNumber).eq("host_id", getHostId()));
        if (!Cools.isEmpty(pakouts)) {
            if (pakouts.get(0).getWrkSts() == 1) {
                pakoutService.stockOutPrint(null, docNumber, getUserId(), getHostId());
        Order order_no = orderService.selectOne(new EntityWrapper<Order>()
                .eq("order_no", docNumber));
        if (!Cools.isEmpty(order_no)) {
            if (order_no.getSettle() == 2) {
                order_no.setSettle(7L);
                orderService.update(order_no,new EntityWrapper<Order>()
                        .eq("order_no",docNumber));
                return R.ok();
            }

        }
        return R.ok();
        return R.error();
    }

}

 src/main/java/zy/cloud/wms/manager/entity/Pickout.java

@@ -92,6 +92,11 @@
    @ApiModelProperty(value= "")
    private String memo;

    @TableField("order_qty")
    private Integer orderQty;

    @TableField("order_nos")
    private String orderNos;
    public Pickout() {}



 src/main/java/zy/cloud/wms/manager/entity/PickoutDetl.java

@@ -225,6 +225,9 @@
    @ApiModelProperty(value= "备注")
    private String memo;

    @TableField("wrk_no")
    private String wrkNo;

    public PickoutDetl() {}



 src/main/java/zy/cloud/wms/manager/mapper/OrderMapper.java

@@ -22,4 +22,7 @@
    void updateStatus(@Param("orderNo") String order);

    void changeSettleTo12(@Param("orderNo") String orderIds);

    void updateWrkSts(@Param("wrkNo") String wrkNo, @Param("docNum") String docNum, @Param("wrkSts") Integer wrkSts, @Param("userId") Long userId, @Param("hostId")
                      Long hostId);
}

 src/main/java/zy/cloud/wms/manager/service/OrderService.java

@@ -23,4 +23,6 @@
    void updateStatus(String order);

    void changeSettleTo12(String orderIds);

    void stockOutPrint(String wrkNo, String docNumber, Long userId, Long hostId);
}

 src/main/java/zy/cloud/wms/manager/service/impl/OrderServiceImpl.java

@@ -62,5 +62,10 @@
        this.baseMapper.changeSettleTo12(orderIds);
    }

    @Override
    public void stockOutPrint(String wrkNo, String docNumber, Long userId, Long hostId) {
        this.baseMapper.updateWrkSts(wrkNo, docNumber, 7, userId, hostId);
    }


}

 src/main/java/zy/cloud/wms/manager/service/impl/PakoutServiceImpl.java

@@ -11,7 +11,8 @@

    @Override
    public Boolean stockOutPrint(String wrkNo, String docNum, Long userId, Long hostId) {
        return this.baseMapper.updateWrkSts(wrkNo, docNum, 2, userId, hostId)>0;
        boolean b = this.baseMapper.updateWrkSts(wrkNo, docNum, 7, userId, hostId) > 0;
        return b;
    }

    @Override

 src/main/resources/mapper/OrderMapper.xml

@@ -52,6 +52,22 @@
    <update id="changeSettleTo12">
        UPDATE man_order set settle = 12 Where 1 = 1 and order_no = #{orderNo}
    </update>
    <update id="updateWrkSts">
        update man_order
        set wrk_sts = #{wrkSts}
        , update_by = #{userId}
        , update_time = getdate()
        where 1=1
        <if test="hostId != null and hostId != ''">
            and host_id = #{hostId}
        </if>
        <if test="wrkNo != null and wrkNo != ''">
            and wrk_no = #{wrkNo}
        </if>
        <if test="docNum != null and docNum != ''">
            and order_no = #{docNum}
        </if>
    </update>

    <select id="getPage" resultMap="BaseResultMap">
        select * from

 src/main/resources/mapper/PickoutDetlMapper.xml

@@ -30,6 +30,7 @@
        <result column="update_time" property="updateTime" />
        <result column="update_by" property="updateBy" />
        <result column="memo" property="memo" />
        <result column="wrk_no" property="wrkNo" />

    </resultMap>