#

lty

2 天以前 e170c300cd11406d414e7da156fc6b2da1c13915

#

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

@@ -8,10 +8,13 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.OpenService;
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.impl.OrderDetlServiceImpl;
import com.zy.common.web.BaseController;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
@@ -48,6 +51,9 @@

    @Autowired
    private LocMastService locMastService;

    @Autowired
    private OrderDetlService orderDetlService;

    @Deprecated
    @PostMapping("/grouping")
@@ -131,6 +137,20 @@
//        openService.packageUp(param);
//        return R.ok();
//    }
    /**
     * 单据实际数量读取
     *
     */
    @PostMapping("/order/AcQuantity/default/v1")
    public synchronized R loadQuantity(@RequestParam String orderNo){
        List<OrderDetl> OrderDetlList;
        if(orderNo != null){
            OrderDetlList = orderDetlService.loadQuantity(orderNo);
        }else{
            return R.error("单据编号[orderNo]不能为空");
        }
        return R.ok().add(OrderDetlList);
    }

    /**
     * 添加入库单

 src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java

@@ -18,6 +18,7 @@
    List<OrderDetl> selectItemByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch);

    List<OrderDetl> selectWorkingDetls(Long orderId);
    List<OrderDetl> loadQuantity(String orderNo);

    List<OrderDetl> getPakoutPage(Map<String, Object> map);


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

@@ -48,6 +48,8 @@
    boolean increaseWorkQty(OrderDetl orderDetl, Double workQty);

    List<OrderDetl> selectItem(String orderNo);
    List<OrderDetl> loadQuantity(String orderNo);


    OrderDetl selectItem(WaitPakin waitPakin);


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

@@ -31,6 +31,11 @@
    }

    @Override
    public List<OrderDetl> loadQuantity(String orderNo){
        return baseMapper.loadQuantity(orderNo);
    }

    @Override
    public List<OrderDetl> selectItem(String orderNo) {
        return this.baseMapper.listByOrderNo(orderNo);
    }

 src/main/java/com/zy/system/controller/LicenseCreatorController.java

@@ -61,6 +61,9 @@
     */
    @RequestMapping(value = "/getLicenseDays")
    public R getLicenseDays() {
//        if (true){
//            return R.ok().add(999);
//        }
        LicenseVerify licenseVerify = new LicenseVerify();
        LicenseContent verifyInfo = licenseVerify.getVerifyInfo();
        if (verifyInfo == null) {

 src/main/java/com/zy/system/entity/license/LicenseCheckListener.java

@@ -82,8 +82,9 @@
                LicenseContent install = licenseVerify.install(param);

                logger.info("++++++++ 许可证加载结束 ++++++++");

                return install != null;

//                return true;
            } catch (Exception e) {
                return false;
            }

 src/main/resources/license.lic

Binary files differ

 src/main/resources/mapper/OrderDetlMapper.xml

@@ -98,6 +98,11 @@
        and qty &lt; anfme
    </select>

    <select id="loadQuantity" resultMap="BaseResultMap">
        select order_id,order_no,model,maktx,anfme,qty from man_order_detl
        where  order_no = #{orderNo}
    </select>

    <sql id="pakOutPageCondition">
        <if test="order_id!=null and order_id!='' ">
            and mod.order_id like '%' + #{order_id} + '%'