#

LSH

2023-03-27 b50a2e2df1c0fab844dc194ae58f01cf906e32b8

 src/main/java/com/zy/common/service/erp/task/ErpScheduler.java

@@ -16,7 +16,6 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;

import java.util.Date;
@@ -29,7 +28,7 @@
 * Created by vincent on 2020/11/27
 */
@Slf4j
@Component
//@Component
public class ErpScheduler extends AbstractHandler<Exception> {

    @Autowired
@@ -76,12 +75,11 @@

                    if (!matService.insert(mat)) {
                        throw new CoolException(good.getBarCode() + "商品同步失败");
                    } else {
                        int state = 1;
                        if (!erpService.updateStateForGoods(good.getBarCode(), state)) {
                            throw new CoolException(good.getBarCode() + "商品修改State为"+state+"失败");
                        }
                    }
                }
                int state = 1;
                if (!erpService.updateStateForGoods(good.getBarCode(), state)) {
                    throw new CoolException(good.getBarCode() + "商品修改State为"+state+"失败");
                }
            }
        }
@@ -145,59 +143,55 @@
                    throw new CoolException(order.getOrderNo() + "生成单据主档失败，请联系管理员");
                }


                Mat mat = matService.selectByMatnr(voucher.getMaterialNO());
                if (mat == null) {
                    throw new CoolException(voucher.getMaterialNO() + "物料号不存在");
                }

                OrderDetl orderDetl = new OrderDetl();
                orderDetl.sync(mat);
                StringBuilder sb = new StringBuilder();
                if (!Cools.isEmpty(dto.getDetails())) {
                // 繳庫單
                if (docType.getPakin() == 1) {
                    for (VoucherDetail detail : dto.getDetails()) {
                        sb.append(detail.getBarcode()).append(",");
                    }
                    orderDetl.setBatch(sb.toString());
                }
                orderDetl.setAnfme(voucher.getExpectedWeight());
                orderDetl.setOrderId(order.getId());
                orderDetl.setOrderNo(order.getOrderNo());
                orderDetl.setCreateBy(9527L);
                orderDetl.setCreateTime(now);
                orderDetl.setUpdateBy(9527L);
                orderDetl.setUpdateTime(now);
                orderDetl.setStatus(1);
                orderDetl.setQty(0.0D);
                if (!orderDetlService.insert(orderDetl)) {
                    throw new CoolException(order.getOrderNo() + "生成单据明细失败，请联系管理员");
                }
                        OrderDetl orderDetl = new OrderDetl();
                        orderDetl.sync(mat);

//                else {
//                    for (VoucherDetail detail : dto.getDetails()) {
//
//                        Mat mat = matService.selectByMatnr(voucher.getMaterialNO());
//                        if (mat == null) {
//                            throw new CoolException(voucher.getMaterialNO() + "物料号不存在");
//                        }
//
//                        OrderDetl orderDetl = new OrderDetl();
//                        orderDetl.sync(mat);
////                    orderDetl.setBatch(detlDto.getBatch());
//                        orderDetl.setAnfme(1.0D);
//                        orderDetl.setOrderId(order.getId());
//                        orderDetl.setOrderNo(order.getOrderNo());
//                        orderDetl.setCreateBy(9527L);
//                        orderDetl.setCreateTime(now);
//                        orderDetl.setUpdateBy(9527L);
//                        orderDetl.setUpdateTime(now);
//                        orderDetl.setStatus(1);
//                        orderDetl.setQty(0.0D);
//                        if (!orderDetlService.insert(orderDetl)) {
//                            throw new CoolException(order.getOrderNo() + "生成单据明细失败，请联系管理员");
//                        }
//                    }
//                }
                        orderDetl.setBatch(detail.getBarcode());
                        orderDetl.setAnfme(mat.getWeight());

                        orderDetl.setOrderId(order.getId());
                        orderDetl.setOrderNo(order.getOrderNo());
                        orderDetl.setCreateBy(9527L);
                        orderDetl.setCreateTime(now);
                        orderDetl.setUpdateBy(9527L);
                        orderDetl.setUpdateTime(now);
                        orderDetl.setStatus(1);
                        orderDetl.setQty(0.0D);
                        if (!orderDetlService.insert(orderDetl)) {
                            throw new CoolException(order.getOrderNo() + "生成单据明细失败，请联系管理员");
                        }
                    }
                } else {
                    OrderDetl orderDetl = new OrderDetl();
                    orderDetl.sync(mat);
                    StringBuilder sb = new StringBuilder();
                    if (!Cools.isEmpty(dto.getDetails())) {
                        for (VoucherDetail detail : dto.getDetails()) {
                            sb.append(detail.getBarcode()).append(",");
                        }
                        orderDetl.setBatch(sb.toString());
                    }
                    orderDetl.setAnfme(voucher.getExpectedWeight());
                    orderDetl.setOrderId(order.getId());
                    orderDetl.setOrderNo(order.getOrderNo());
                    orderDetl.setCreateBy(9527L);
                    orderDetl.setCreateTime(now);
                    orderDetl.setUpdateBy(9527L);
                    orderDetl.setUpdateTime(now);
                    orderDetl.setStatus(1);
                    orderDetl.setQty(0.0D);
                    if (!orderDetlService.insert(orderDetl)) {
                        throw new CoolException(order.getOrderNo() + "生成单据明细失败，请联系管理员");
                    }
                }

                // erp 同步
                int state = 1;