#

lty

2 天以前 102a41a8d5c231dd306bad622344e98312c1a774

#

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

@@ -13,6 +13,8 @@
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.OrderDetlPakinServiceImpl;
import com.zy.asrs.service.impl.OrderPakinServiceImpl;
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.model.WrkDto;
import com.zy.common.web.BaseController;
@@ -54,6 +56,10 @@

    @Resource
    private StaDescService staDescService;
    @Autowired
    private OrderPakinServiceImpl orderPakinService;
    @Autowired
    private OrderDetlPakinServiceImpl orderDetlPakinService;

    @RequestMapping("/pda/WarehouseOut/v1")
    @ManagerAuth(memo = "并板途中拣料-参考念初")
@@ -197,6 +203,40 @@
        return R.ok().add(combParams);
    }

    @RequestMapping("/order/search/orderDetl/auth")
    @ManagerAuth
    public R orderDetlSearchByBarcode(@RequestBody OrderDetlByCode param){
        if (Cools.isEmpty(param)){
            return R.ok();
        }
        List<OrderDetlPakin> orderDetls = orderDetlPakinService.selectOrderDetls(param);
        CombParam combParam = new CombParam();
        if (!Cools.isEmpty(orderDetls)) {
            LinkedList<CombParam.CombMat> combMats = new LinkedList<>();

            for (OrderDetlPakin od : orderDetls) {
                CombParam.CombMat mat = new CombParam.CombMat();
                mat.setMatnr(od.getMatnr());
                mat.setOrderNo(od.getOrderNo());
                mat.setAnfme(od.getAnfme() - od.getWorkQty());
                mat.setMaktx(od.getMaktx());
                mat.setSku(od.getSku());
                mat.setMemo(od.getMemo());
                mat.setSupp(od.getSupp());
                mat.setBoxType1(od.getBoxType1());
                mat.setBoxType2(od.getBoxType2());
                mat.setBoxType3(od.getBoxType3());
                mat.setStandby1(od.getStandby1());
                mat.setStandby2(od.getStandby2());
                mat.setStandby3(od.getStandby3());
                combMats.add(mat);
            }
            combParam.setCombMats(combMats);
        }
        return R.ok().add(combParam);
    }



    @RequestMapping("/comb/auth")
    @ManagerAuth(memo = "组托")

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

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

import lombok.Data;

@Data
public class OrderDetlByCode {
    String sku;//客户sku
    String upc;//条码upc
    String orderNo;//采购单号
}

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

@@ -56,4 +56,7 @@
            , @Param("boxType1")String boxType1,
                        @Param("boxType2")String boxType2,
                        @Param("boxType3")String boxType3, @Param("workQty")Double workQty);

    List<OrderDetlPakin> selectOrderDetls(@Param("orderNo")String orderNo,@Param("sku")String sku,@Param("upc") String upc);

}

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

@@ -1,6 +1,7 @@
package com.zy.asrs.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.OrderDetlPakin;
import com.zy.asrs.entity.OrderPakin;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.OrderDetlPakin;
import com.zy.asrs.entity.param.OrderDetlByCode;

import java.util.List;

@@ -44,4 +45,7 @@
     */
    boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3
            , String boxType1, String boxType2, String boxType3, Double workQty);

    List<OrderDetlPakin> selectOrderDetls(OrderDetlByCode orderDetlByCode);

}

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

@@ -5,6 +5,7 @@
import com.zy.asrs.entity.OrderDetlPakin;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.param.OrderDetlByCode;

import java.util.List;

@@ -38,4 +39,5 @@

    boolean updateOrderStatus(String orderNo);


}

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

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.zy.asrs.entity.OrderDetlPakin;
import com.zy.asrs.entity.param.OrderDetlByCode;
import com.zy.asrs.mapper.OrderDetlPakinMapper;
import com.zy.asrs.service.OrderDetlPakinService;
import org.springframework.stereotype.Service;
@@ -99,4 +100,11 @@
    public boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double workQty) {
        return this.baseMapper.increaseWorkQty(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, workQty) > 0;
    }
    @Override
    public List<OrderDetlPakin> selectOrderDetls(OrderDetlByCode orderDetlByCode){
        String orderNo = orderDetlByCode.getOrderNo();
        String upc = orderDetlByCode.getUpc();
        String sku = orderDetlByCode.getSku();
        return this.baseMapper.selectOrderDetls(orderNo,sku,upc);
    }
}

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

@@ -9,6 +9,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
import com.zy.asrs.entity.param.OpenOrderPakoutParam;
import com.zy.asrs.entity.param.OrderDetlByCode;
import com.zy.asrs.mapper.OrderDetlPakinMapper;
import com.zy.asrs.mapper.OrderPakinMapper;
import com.zy.asrs.service.*;
@@ -210,4 +211,6 @@
    public boolean updateOrderStatus(String orderNo){
        return this.baseMapper.updateOrderStatus(orderNo);
    }


}

 src/main/resources/mapper/OrderDetlPakinMapper.xml

@@ -242,4 +242,14 @@
        <include refid="standbyAll"></include>
    </update>

    <select id="selectOrderDetls" resultMap="BaseResultMap">
        SELECT *
        FROM man_order_detl_pakin
        where 1=1
        and box_type3 = #{orderNo}
        and standby3 = #{sku}
        and standby2 = #{upc}
        order by update_time
    </select>

</mapper>

 src/main/resources/mapper/OrderPakinMapper.xml

@@ -114,4 +114,6 @@
        and order_no = #{orderNo}
    </update>



</mapper>