#pda盘点

zjj

2023-09-13 8a984617b478a0a424c7fd033c7bb8c88bac5d85

#pda盘点

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

@@ -11,6 +11,7 @@
import com.core.common.R;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.LocDetlAdjustParam;
import com.zy.asrs.service.LocCheckService;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.ManLocDetlService;
import com.zy.asrs.service.MatService;
@@ -40,14 +41,17 @@
    @Autowired
    private MatService matService;

    @RequestMapping(value = "/manlocDetl/locNo")
    @ManagerAuth
    public R locNoList(@RequestParam String locNo){
    @Autowired
    private LocCheckService locCheckService;

        if (Cools.isEmpty(locNo)){
    @RequestMapping(value = "/manlocDetl/orderNo")
    @ManagerAuth
    public R locNoList(@RequestParam String orderNo){

        if (Cools.isEmpty(orderNo)){
            return R.error("无数据");
        }
        List<ManLocDetl> list = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>().eq("loc_no", locNo));
        List<LocCheck> list = locCheckService.selectList(new EntityWrapper<LocCheck>().eq("order_no", orderNo));
        return R.ok(list);
    }


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

@@ -10,6 +10,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustNewParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.entity.param.OffSaleParam;
import com.zy.asrs.entity.result.MobileAdjustResult;
@@ -338,6 +339,13 @@
        return R.ok("盘点成功");
    }

    @RequestMapping("/adjustNew/auth")
    @ManagerAuth(memo = "盘点")
    public R adjustNew(@RequestBody MobileAdjustNewParam combParam){
        mobileService.adjustNew(combParam, getUserId());
        return R.ok("盘点成功");
    }

    @PostMapping("/order/out/pakout/auth")
    @ManagerAuth(memo = "订单出库")
    public synchronized R pakoutByOrder(@RequestBody JSONObject param) {

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

@@ -137,7 +137,7 @@
        orderCheck.setOrderTime(DateUtils.convert(now));
        orderCheck.setStatus(1);
        orderCheck.setSettle(1L);
        orderCheck.setDocType(23L);
        orderCheck.setDocType(16L);
        orderCheck.setCreateTime(now);
        orderCheck.setUpdateTime(now);
        if (!orderCheckService.insert(orderCheck)) {

 src/main/java/com/zy/asrs/entity/WrkDetl.java

@@ -74,6 +74,10 @@
    @TableField("order_no")
    private String orderNo;

    @ApiModelProperty(value= "库位号")
    @TableField("loc_no")
    private String locNo;

    /**
     * 规格
     */

 src/main/java/com/zy/asrs/entity/param/MobileAdjustNewParam.java

New file
@@ -0,0 +1,15 @@
package com.zy.asrs.entity.param;

import com.zy.asrs.entity.WrkDetl;
import lombok.Data;

import java.util.List;
@Data
public class MobileAdjustNewParam {

        private String orderNo;

        private List<WrkDetl> wrkDetls;


}

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

@@ -6,6 +6,7 @@
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustNewParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.entity.param.OffSaleParam;
import com.zy.system.entity.User;
@@ -46,4 +47,5 @@
    R manDetlOut(JSONObject json,User user);
    R manDetlInBarcode(JSONObject json ,User user);

    R adjustNew(MobileAdjustNewParam combParam, Long userId);
}

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

@@ -9,10 +9,7 @@
import com.core.exception.CoolException;
import com.sun.org.apache.xpath.internal.operations.Or;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.entity.param.OffSaleParam;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
@@ -82,6 +79,9 @@
    private ManLocDetlMapper manLocDetlMapper;
    @Autowired
    private WaitPakinLogService waitPakinLogService;

    @Autowired
    private  LocCheckService locCheckService;



@@ -893,4 +893,51 @@
        }
        return R.ok("上架成功");
    }

    @Override
    public R adjustNew(MobileAdjustNewParam combParam, Long userId) {


        for (WrkDetl detl: combParam.getWrkDetls()){
            EntityWrapper<LocCheck> wrapper = new EntityWrapper<>();
            wrapper.eq("order_no", combParam.getOrderNo())
                    .eq("matnr", detl.getMatnr())
                    .eq("loc_no", detl.getLocNo());
            LocCheck CheckDetl = locCheckService.selectOne(wrapper);
            if (CheckDetl == null){
                Date now = new Date();
                LocCheck locCheck = new LocCheck();
                locCheck.setLocNo(detl.getLocNo());
                locCheck.setMaktx(detl.getMaktx());
                locCheck.setType(1);
                locCheck.setMatnr(detl.getMatnr());
                locCheck.setAnfme(detl.getAnfme());
                locCheck.setRealAnfme(detl.getAnfme());
                locCheck.setDiffAnfme(detl.getAnfme());
                locCheck.setExamine(0);
                locCheck.setOwner(detl.getOwner());
                locCheck.setPayment(detl.getPayment());
                locCheck.setCreateTime(now);
                locCheck.setUpdateTime(now);
                locCheck.setOrderNo(combParam.getOrderNo());

                if (!locCheckService.insert(locCheck)){
                    return R.error("盘点明细插入失败");
                }
            }else {
                CheckDetl.setRealAnfme(detl.getAnfme());
                CheckDetl.setDiffAnfme(detl.getAnfme()- CheckDetl.getAnfme());
                if (!locCheckService.update(CheckDetl,wrapper)){
                    return R.error("明细更新失败");
                }



            }


        }

        return R.ok("盘点成功");
    }
}

 src/main/webapp/static/js/orderCheck/orderCheck.js

@@ -239,6 +239,7 @@
                                layer.close(dIndex);
                                $(".layui-laypage-btn")[0].click();
                                layer.msg(res.msg, {icon: 1});
                                insTb.reload();
                            } else if (res.code === 403){
                                top.location.href = baseUrl+"/";
                            }else {

 src/main/webapp/views/orderCheck/orderCheck.html

@@ -155,7 +155,6 @@
          <option value="all" selected="">全部物料</option>
          <option value="matnr">物料号</option>
          <option value="locno">库位号</option>
          <option value="owner">货主</option>
        </select>
      </div>
    </div>