#

luxiaotao1123

2021-03-02 a2613d9aaaafecf790db9a3a94f965dc5d1ba41e

#

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

@@ -13,10 +13,7 @@
import zy.cloud.wms.manager.entity.LocDetl;
import zy.cloud.wms.manager.entity.Mat;
import zy.cloud.wms.manager.entity.Pakout;
import zy.cloud.wms.manager.service.LocDetlService;
import zy.cloud.wms.manager.service.MatService;
import zy.cloud.wms.manager.service.PakoutService;
import zy.cloud.wms.manager.service.PriorService;
import zy.cloud.wms.manager.service.*;

import java.util.Date;
import java.util.List;
@@ -36,7 +33,7 @@
    @Autowired
    private PakoutService pakoutService;
    @Autowired
    private PriorService priorService;
    private CustOrderService custOrderService;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;

@@ -84,6 +81,10 @@
                    issued = issued - locDetl.getAnfme();
                }
            }
            // 修改单据状态
            if (!custOrderService.updateStatus(custOrder.getNumber(), 2)) {
                throw new CoolException("修改单据状态失败");
            }
        }
    }


 src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java

@@ -69,7 +69,7 @@
                                data.getQty(),    // 商品数量
                                data.getPrice(),    // 商品单价
                                data.getComment(),    // 商品备注[非空]
                                1,    // 状态
                                0,    // 状态
                                now,    // 添加时间
                                now,    // 修改时间
                                null    // 备注
@@ -83,7 +83,7 @@
                    if (complete) {
                        List<String> collect = list.stream().map(GetDataResult::getNumber).distinct().collect(Collectors.toList());
                        for (String number : collect) {
                            custOrderService.completeLoading(number);
                            custOrderService.updateStatus(number, 1);
                        }
                    }


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

@@ -42,7 +42,7 @@
    }

    @RequestMapping("/stock/out")
    @ManagerAuth(memo = "拣货")
    @ManagerAuth(memo = "捡货")
    public R stockOut(@RequestBody StockOutParam stockOutParam) {
        return workService.stockOut(stockOutParam, getUserId());
    }

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

@@ -1,5 +1,6 @@
package zy.cloud.wms.manager.mapper;

import org.apache.ibatis.annotations.Param;
import zy.cloud.wms.manager.entity.CustOrder;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
@@ -9,7 +10,7 @@
@Repository
public interface CustOrderMapper extends BaseMapper<CustOrder> {

    int updateStatus(@Param("number") String number, @Param("status") Integer status);

    int completeLoading(String number);

}

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

@@ -5,6 +5,6 @@

public interface CustOrderService extends IService<CustOrder> {

    boolean completeLoading(String number);
    boolean updateStatus(String number, Integer status);

}

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

@@ -10,7 +10,7 @@
public class CustOrderServiceImpl extends ServiceImpl<CustOrderMapper, CustOrder> implements CustOrderService {

    @Override
    public boolean completeLoading(String number) {
        return this.baseMapper.completeLoading(number) > 0;
    public boolean updateStatus(String number, Integer status) {
        return this.baseMapper.updateStatus(number, status) > 0;
    }
}

 src/main/resources/mapper/CustOrderMapper.xml

@@ -19,8 +19,8 @@

    </resultMap>

    <update id="completeLoading">
        update man_cust_order set status = 1 where 1=1 and number = #{number}
    <update id="completeOrder">
        update man_cust_order set status = #{status} where 1=1 and number = #{number}
    </update>

</mapper>