1

luxiaotao1123

2021-09-23 ff8ae23da4205f072c823ea2a5e095386c6672db

1

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

@@ -17,6 +17,8 @@

    Integer queryOutStockFInterID(String supplier);

    boolean incrementCPakOut(Integer FInterID, String Fnumber, Double increment, String FBillNo);

    /**
     * 出库作业
     */

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

@@ -16,13 +16,17 @@
import com.zy.common.service.CommonService;
import com.zy.common.service.erp.entity.OutStockBillEntry;
import io.swagger.models.auth.In;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.math.BigDecimal;
import java.text.MessageFormat;
import java.util.*;

@Slf4j
@Service("outStockService")
public class OutStockServiceImpl extends ServiceImpl<OutStockMapper, OutStockBillEntry> implements OutStockService{
    // 工作号生成规则默认类型
@@ -43,6 +47,8 @@
    private WrkDetlService wrkDetlService;
    @Autowired
    private LocNormalService locNormalService;
    @Autowired
    private JdbcTemplate jdbcTemplate;

    @Override
    public Page<OutStockBillEntry> queryOutStock(Page<OutStockBillEntry> page) {
@@ -82,6 +88,44 @@
       return baseMapper.queryOutStockFInterID(supplier);
    }

    /* 成品增量出库 */
    @Override
    public boolean incrementCPakOut(Integer FInterID, String Fnumber, Double increment, String FBillNo) {
        String sql = "update OutStockbillEntry set FAuxCommitQty = (FAuxCommitQty + {0,number,#}) where 1=1 and Fnumber = ''{1}'' and FInterID = {2,number,#}";
        sql = MessageFormat.format(sql, increment, Fnumber, FInterID);
        if (jdbcTemplate.update(sql) > 0) {
            sql = "select * from OutStockbillEntry where 1=1 and Fnumber = ''{0}'' and FInterID = {1,number,#}";
            sql = MessageFormat.format(sql, Fnumber, FInterID);
            List<OutStockBillEntry> select = jdbcTemplate.queryForList(sql, OutStockBillEntry.class);
            OutStockBillEntry outStockBillEntry = select.get(0);
            boolean complete = false;
            if (outStockBillEntry.getFQty().compareTo(BigDecimal.ZERO) == 1) {
                if (outStockBillEntry.getFAuxCommitQty().compareTo(outStockBillEntry.getFQty()) > -1) {
                    complete = true;
                }
            } else {
                if (outStockBillEntry.getFAuxCommitQty().compareTo(outStockBillEntry.getFAuxQty()) > -1) {
                    complete = true;
                }
            }
            if (complete) {
                if (!completeCPakOut(FBillNo)) {
                    log.error("{}出库单标记完成失败", FBillNo);
                }
            }
            return true;
        } else {
            return false;
        }
    }

    /* 成品出库单标记完成 */
    private boolean completeCPakOut(String FBillNo){
        String sql = "update OutStockbill set Fflag_finish = 1 where FBillNo = ''{0}''";
        sql = MessageFormat.format(sql, FBillNo);
        return jdbcTemplate.update(sql) > 0;
    }

    @Override
    @Transactional
    public void startupFullTakeStore(StockOutParam param, Long userId) {

 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java

@@ -12,6 +12,7 @@
import com.zy.common.service.erp.ErpService;
import com.zy.common.service.erp.entity.OutStockBillEntry;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -43,6 +44,8 @@
    private ErpService erpService;
    @Autowired
    private OutStockService outStockService;
    @Autowired
    private JdbcTemplate jdbcTemplate;

    @GetMapping("/test1")
    public String test1(String barcode){
@@ -97,18 +100,25 @@
                        Integer FInterI = outStockService.queryOutStockFInterID(wrkDetl.getSupplier()); // 获取出库单主表主键
                        if (!Cools.isEmpty(FInterI)) {
                            if (!erpService.incrementCPakOut(FInterI, wrkDetl.getMatnr(),  wrkDetl.getAnfme(), wrkDetl.getSupplier())) {
                                exceptionHandle("更新ERP成品出库数据[matnr={0}]失败", wrkDetl.getMatnr());
                                exceptionHandle("[xtyasrs_dual]更新ERP成品出库数据[matnr={0}]失败", wrkDetl.getMatnr());
                            }
                        }
//                        if (wrkDetl.getMemo().equals("原材料")) {
//                            // 待实现
//                        } else if (wrkDetl.getMemo().equals("成品")) {
//
//                        }
                        if (wrkDetl.getMemo().equals("原材料")) {
                            // 待实现


                        } else if (wrkDetl.getMemo().equals("成品")) {
                            if (!outStockService.incrementCPakOut(FInterI, wrkDetl.getMatnr(),  wrkDetl.getAnfme(), wrkDetl.getSupplier())) {
                                exceptionHandle("[xtyasrs]更新ERP成品出库数据[matnr={0}]失败", wrkDetl.getMatnr());
                            }

                        }
                    }
                }
            }



            // 保存工作主档历史档
            if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
                exceptionHandle("保存工作历史档[workNo={0}]失败", wrkMast.getWrkNo());

 src/main/resources/mapper/OutStockMapper.xml

@@ -61,6 +61,7 @@
        b.FAdd,b.Fflag_finish, a.Fname, a.Fmodel
        from OutStockBillEntry a left join OutStockBill b on a.FInterID = b.FInterID
        where 1=1
        and b.Fflag_finish != 1
        <if test="FSourceBillNo!=null and FSourceBillNo!='' ">
            and a.FSourceBillNo = #{FSourceBillNo}
        </if>