Merge branch 'tzhneasrs' of http://47.97.1.152:5880/r/zy-asrs into tzhneasrs

zyx

2024-07-08 0caed17a984ea21a0b92478f52cf90c101d1085e

Merge branch 'tzhneasrs' of http://47.97.1.152:5880/r/zy-asrs into tzhneasrs

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

@@ -5,10 +5,12 @@
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.LocOwner;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.StockVo;
import com.zy.asrs.service.LocOwnerService;
import com.zy.asrs.service.OpenService;
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.OrderService;
@@ -19,9 +21,11 @@
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import java.security.acl.Owner;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;

/**
 * Created by vincent on 2022/4/8
@@ -42,6 +46,8 @@
    private OrderService orderService;
    @Autowired
    private OrderDetlService orderDetlService;
    @Autowired
    private LocOwnerService locOwnerService;

    @PostMapping("/order/matSync/default/v1")
    @AppAuth(memo = "商品信息同步接口")
@@ -56,6 +62,32 @@
        return R.ok();
    }

    @PostMapping("/order/ownerSync/default/v1")
    @AppAuth(memo = "供应商档案同步接口")
    public synchronized R syncOwnerInfo(@RequestHeader(required = false) String appkey,
                                      @RequestBody(required = false) Map<String,String> param,
                                      HttpServletRequest request){
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }

        Integer deleteFlag = Integer.parseInt(param.get("deleteFlag"));

        if (deleteFlag == 1){
            locOwnerService.delete(new EntityWrapper<LocOwner>().eq("owner",param.get("owner")));
        }else {
            LocOwner locOwner = new LocOwner();
            locOwner.setOwner(param.get("owner"));
            locOwner.setPhone(param.get("phone"));
            locOwner.setAddr(param.get("addr"));
            locOwnerService.insert(locOwner);
        }


        return R.ok();
    }

    /**
     * 添加入库单
     */

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

@@ -18,6 +18,8 @@

    public List<MatParam> matDetails;

    public Integer deleteFlag;

    @Data
    public static class MatParam{
        /**

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

@@ -49,7 +49,7 @@
    }

    public void setdDate(String dDate) throws ParseException {
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/DD hh:mm:ss");
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-DD hh:mm:ss");
        this.dDate =  sdf.parse(dDate);
    }


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

@@ -408,8 +408,18 @@
    @Override
    @Transactional
    public void syncMat(MatSyncParam param) {

        if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <= 0) {
            throw new CoolException("商品数据为空");
        }

        //删除存货档案
        if(param.deleteFlag == 1){
            for (MatSyncParam.MatParam matParam : param.getMatDetails()){
                matService.deleteById(matParam.getMatnr());
            }

            return;
        }

        for (MatSyncParam.MatParam matParam : param.getMatDetails()) {
@@ -577,8 +587,8 @@
                OpenOrderPakoutParam param = new OpenOrderPakoutParam();
                String type = Cools.isEmpty(pla.getProOrderNo()) ? "调拨入库单" : "生产入库单";
                param.setcCode(pla.getProOrderNo());
                param.setcAccount(pla.getOwner());
                param.setdDate(Utils.getDateStr1(new Date()));
                param.setcAccount(pla.getWorkshop());
                param.setdDate(Utils.getDateStr(new Date()));
                param.setType(type);

                List<OpenOrderPakoutParam.Body> bodyList = new ArrayList<>();

 src/main/resources/application.yml

@@ -60,5 +60,5 @@
  enable: false

u8:
  url: localhost:8080
  path: /test/report
  url: 122.225.245.106:10076
  path: /api/Yp/U8API

 src/main/webapp/views/pla/sellout.html

@@ -246,7 +246,7 @@
                checkData[i].customer = $('#customer').val();
                checkData[i].phone = $('#phone').val();
                checkData[i].addr = $('#addr').val();
                checkData[i].orderWeight = detailData[i] ? detailData[i].weight : checkData[i].weightAnfme;
                checkData[i].orderWeight = detailData[i] ? detailData[i].weight : checkData[i].weightAnfme - checkData[i].qtyAnfme;
                checkData[i].allocate = $('#allocate').val();
                checkData[i].memo = $('#memo').val();
                checkData[i].pakoutTime = $('#pakoutTime').val();