联调

dubin

13 小时以前 08464b5b3bc79be5397a48927a6603f2e3287446

联调

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

@@ -16,6 +16,7 @@
import com.zy.asrs.service.MatBarcodeService;
import com.zy.asrs.service.MatService;
import com.zy.asrs.service.MobileService;
import com.zy.asrs.service.WaitPakinService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@@ -36,6 +37,8 @@
    private MobileService mobileService;
    @Autowired
    private MatService matService;
    @Autowired
    private WaitPakinService waitPakinService;
    /*
    * 物料托盘绑定分页查询
    * */
@@ -79,6 +82,25 @@
        return R.ok();
    }

    /*
    * 批量组托
    * */
    @RequestMapping("/barcodeMatnr/matnrAndBarcode")
    @ManagerAuth(memo = "物料托盘批量组托")
    public R matnrAndBarcode(@RequestBody List<MatBarcode> list) {
        if (Cools.isEmpty(list)){
            return R.error(BaseRes.PARAM);
        }
        for (MatBarcode matBarcode : list) {
            if (!matBarcode.getZpallet().equals(list.get(0).getZpallet())){
                throw new CoolException("请选择相同托盘码的数据");
            }
        }
        waitPakinService.comb(list);
        return R.ok("组托成功");

    }

    /*物料托盘绑定
    *
    * */

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

@@ -1,8 +1,12 @@
package com.zy.asrs.service;

import com.zy.asrs.entity.MatBarcode;
import com.zy.asrs.entity.WaitPakin;
import com.baomidou.mybatisplus.service.IService;

import java.util.List;

public interface WaitPakinService extends IService<WaitPakin> {

    void comb(List<MatBarcode> list);
}

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

@@ -1,12 +1,69 @@
package com.zy.asrs.service.impl;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.WaitPakinMapper;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.service.WaitPakinService;
import com.zy.asrs.service.*;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.common.model.DetlDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

@Service("waitPakinService")
public class WaitPakinServiceImpl extends ServiceImpl<WaitPakinMapper, WaitPakin> implements WaitPakinService {
    @Autowired
    private LocDetlService locDetlService;
    @Autowired
    private WrkDetlService wrkDetlService;
    @Autowired
    private WrkMastService wrkMastService;
    @Autowired
    private MatService matService;
    @Autowired
    private WaitPakinService waitPakinService;

    @Override
    public void comb(List<MatBarcode> list) {
        String zpallet = list.get(0).getZpallet();
        if (zpallet.length() != 8) {
            throw new CoolException("条码长度不是8位===>>" + zpallet);
        }
        int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", zpallet));
        int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", zpallet));
        WrkMast wrkMast = wrkMastService.selectByBarcode(zpallet);
        if (countLoc > 0 || (countWrk > 0 && wrkMast.getWrkSts() != 15)) {
            throw new CoolException("组托档/工作档/库存条码数据已存在===>>" + zpallet);
        }
        Date now = new Date();
        for (MatBarcode matBarcode : list) {
            Mat mat = matService.selectByMatnr(matBarcode.getMatnr());
            if (Cools.isEmpty(mat)) {
                throw new CoolException(matBarcode.getMatnr() + "商品档案不存在");
            }
            WaitPakin waitPakin1 = new WaitPakin();
            waitPakin1.sync(mat);
            ///waitPakin1.setProType(dto.getProType());
            //waitPakin1.setTemp2(dto.getTemp2());
            //waitPakin1.setOutOrderNo(dto.getOutOrderNo());
            //waitPakin1.setBatch(dto.getBatch());
            waitPakin1.setZpallet(matBarcode.getZpallet());   // 托盘码
            waitPakin1.setIoStatus("N");     // 入出状态
            waitPakin1.setAnfme(1.0);  // 数量
            waitPakin1.setStatus("Y");    // 状态
            //waitPakin1.setAppeUser(waitPakin.getAppeUser());
            waitPakin1.setAppeTime(now);
            //waitPakin1.setModiUser(waitPakin.getAppeUser());
            waitPakin1.setModiTime(now);
            //waitPakin1.setMemo(detlDto.getMemo());
            if (!waitPakinService.insert(waitPakin1)) {
                throw new CoolException("保存入库通知档失败");
            }
        }
    }
}

 src/main/webapp/static/js/barcodeMatnr/barcodeMatnr.js

@@ -144,19 +144,46 @@
                    }
                });
                break;
            // case 'deleteData':
            //     layer.open({
            //         type: 2,
            //         title: '组托',
            //         maxmin: true,
            //         area: [top.detailWidth, top.detailHeight],
            //         content: 'barcodeMatnr_comb.html',
            //         success: function(layero, index){
            //             layer.getChildFrame('#data-detail-submit-edit', index).hide();
            //             clearFormVal(layer.getChildFrame('#detail', index));
            //             layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
            //         }
            //     });
            //     break;
            case 'deleteData':
                layer.open({
                    type: 2,
                    title: '组托',
                    maxmin: true,
                    area: [top.detailWidth, top.detailHeight],
                    content: 'barcodeMatnr_comb.html',
                    success: function(layero, index){
                        layer.getChildFrame('#data-detail-submit-edit', index).hide();
                        clearFormVal(layer.getChildFrame('#detail', index));
                        layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
                    }
                });
                if (checkStatus.data.length === 0){
                    layer.msg('请至少选择一条数据', {icon: 2});
                } else {
                    layer.confirm('确定组托吗', function(){
                        $.ajax({
                            url: baseUrl+"/barcodeMatnr/matnrAndBarcode",
                            headers: {'token': localStorage.getItem('token')},
                            data: JSON.stringify(checkStatus.data),
                            contentType:'application/json;charset=UTF-8',
                            method: 'POST',
                            traditional:true,
                            success: function (res) {
                                if (res.code === 200){
                                    layer.closeAll();
                                    tableReload(false);
                                    layer.msg(res.msg, {icon: 1})
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg, {icon: 2})
                                }
                            }
                        })
                    });
                }
                break;
            case 'clampData':
                layer.open({