#杰克缝纫机立库 【根据单号检索单据数据】 优化1

luxiaotao1123

2022-03-25 7f959c4938705b186749f898bc7a2ce80e610dde

#杰克缝纫机立库 【根据单号检索单据数据】 优化1

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

@@ -44,6 +44,7 @@

    /**
     * 根据单号检索单据数据
     * http://localhost:8081/jkwms/mobile/order/serach/orderNo/auth?orderNo=123123
     */
    @RequestMapping("/order/search/orderNo/auth")
    @ManagerAuth
@@ -60,10 +61,6 @@
    }



    /**
     * 组托
     */
    @RequestMapping("/comb/auth")
    @ManagerAuth(memo = "组托")
    public R comb(@RequestBody CombParam combParam){

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

@@ -275,7 +275,10 @@
    }

    public Double getEnableQty() {
        return this.anfme - this.qty;
        if (null != this.anfme && this.qty != null) {
            return this.anfme - this.qty;
        }
        return null;
    }

}

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

@@ -16,4 +16,6 @@

    List<OrderDetl> selectWorkingDetls(Long orderId);

    int increase(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty);

}

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

@@ -13,4 +13,6 @@

    OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch);

    boolean increase(Long orderId, String matnr, String batch, Double qty);

}

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

@@ -6,12 +6,10 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.service.MatCodeService;
import com.zy.asrs.service.MobileService;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.service.WaitPakinService;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.VersionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -32,6 +30,8 @@
    private WaitPakinService waitPakinService;
    @Autowired
    private OrderService orderService;
    @Autowired
    private OrderDetlService orderDetlService;

    @Override
    @Transactional
@@ -72,9 +72,30 @@
            if (order.getSettle() > 2) {
                throw new CoolException("单据编号已过期");
            }



            for (CombParam.CombMat comb : param.getCombMats()) {
                OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), comb.getMatNo(), comb.getBatch());
                if (comb.getCount() > orderDetl.getEnableQty()) {
                    throw new CoolException(orderDetl.getMatnr() + "入库数量不合法");
                }
                // 修改单细数量
                if (!orderDetlService.increase(order.getId(), comb.getMatNo(), comb.getBatch(), comb.getCount())) {
                    throw new CoolException("修改单据明细数量失败");
                }
                // 添加入库通知档
                WaitPakin waitPakin = new WaitPakin();
                waitPakin.setZpallet(param.getBarcode());   // 托盘码
                waitPakin.setStatus("Y");    // 状态
                waitPakin.setAnfme(comb.getCount());  // 数量
                waitPakin.setIoStatus("N");     // 入出状态
                waitPakin.setAppeUser(userId);
                waitPakin.setAppeTime(new Date());
                waitPakin.setModiUser(userId);
                waitPakin.setModiTime(new Date());
//                VersionUtils.setWaitPakIn(waitPakin, orderDetl);
                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("添加入库通知档失败");
                }
            }
        }

    }

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

@@ -38,4 +38,9 @@
        }
        return null;
    }

    @Override
    public boolean increase(Long orderId, String matnr, String batch, Double qty) {
        return this.baseMapper.increase(orderId, matnr, batch, qty) > 0;
    }
}

 src/main/resources/mapper/OrderDetlMapper.xml

@@ -47,4 +47,15 @@
        and qty &lt; anfme
    </select>

    <update id="increase">
        update man_order_detl
        set qty = qty + #{qty}
        where 1=1
        and order_id = #{orderId}
        and matnr = #{matnr}
        <if test="batch != null and batch != ''">
            and batch = #{batch}
        </if>
    </update>

</mapper>