xinzeng

svr/svr-base/src/main/java/com/yihu/jw/base/dao/a2dao/MediicinecabinetInventoryDao.java

@@ -12,13 +12,15 @@ import java.util.Map;
public interface MediicinecabinetInventoryDao extends PagingAndSortingRepository<MediicinecabinetInventory, String>, JpaSpecificationExecutor<MediicinecabinetInventory> {
        MediicinecabinetInventory findMediicinecabinetInventoryByIdDeviceAndLayerNoAndWayerNo(String deviceId, String layerNo, String wayerNo);
    MediicinecabinetInventory findMediicinecabinetInventoryByIdDeviceAndLayerNoAndWayerNo(String deviceId, String layerNo, String wayerNo);
        @Query("from MediicinecabinetInventory t where  t.idDevice=?1")
        List<MediicinecabinetInventory> findMediicinecabinetInventoryByDeviceId(String deviceId);
    MediicinecabinetInventory findMediicinecabinetInventoryByEquNumAndLayerNoAndWayerNo(String equNum, String layerNo, String wayerNo);
    @Query("from MediicinecabinetInventory t where  t.idDevice=?1")
    List<MediicinecabinetInventory> findMediicinecabinetInventoryByDeviceId(String deviceId);
    @Query("select layerNo as layerNo from MediicinecabinetInventory where idDevice=?1 group by layerNo")
    List<Map<String,Object>> selectByDeviceIdGroup(String  deviceId);
    List<Map<String, Object>> selectByDeviceIdGroup(String deviceId);
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineOrderService.java

@@ -742,10 +742,10 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
        //表示已出货
        if ("2".equals(status)) {
            //更新药柜库存
            MediicinecabinetInventory inventory = inventoryDao.findMediicinecabinetInventoryByIdDeviceAndLayerNoAndWayerNo(
                    medicineShipmentLog.getDeviceId(),
            MediicinecabinetInventory inventory = inventoryDao.findMediicinecabinetInventoryByEquNumAndLayerNoAndWayerNo(
                    medicineShipmentLog.getDeviceId(),              //equNum
                    medicineShipmentLog.getLayerNo(),
                    medicineShipmentLog.getWayerNo());
                    medicineShipmentLog.getWayerNo().split(",")[0]);
            inventory.setQty(String.valueOf(Integer.parseInt(inventory.getQty()) - 1));
            if (Integer.parseInt(inventory.getQty()) < Integer.parseInt(inventory.getNum())) {
                Mediicinedevice mediicinedevice = deviceDao.findOne(inventory.getIdDevice());