wms服务部分修改

highway
mengjiao 2 years ago
parent 6708ff8f48
commit 2a094ca7f5

@ -23,7 +23,7 @@ import com.op.common.core.web.page.TableDataInfo;
/**
* Controller
*
*
* @author Open Platform
* @date 2023-07-10
*/
@ -68,11 +68,9 @@ public class PowderChargeOrderController extends BaseController {
/**
*
*/
@RequiresPermissions("wms:chargeorder:add")
@Log(title = "粉料配料", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody PowderChargeOrder powderChargeOrder) {
return toAjax(powderChargeOrderService.insertPowderChargeOrder(powderChargeOrder));
@PostMapping("/add")
public AjaxResult add(@RequestBody List<PowderChargeOrder> powderChargeOrders) {
return toAjax(powderChargeOrderService.insertPowderChargeOrderAdd(powderChargeOrders));
}
/**
@ -94,4 +92,18 @@ public class PowderChargeOrderController extends BaseController {
public AjaxResult remove(@PathVariable String[] IDs) {
return toAjax(powderChargeOrderService.deletePowderChargeOrderByIDs(IDs));
}
@PostMapping("/SCgetInfo")
public AjaxResult SCgetInfo(String orderCode) {
return success(powderChargeOrderService.selectPowderChargeOrderByOrderCode(orderCode));
}
//出库
@PostMapping("/SCoutInfo")
public AjaxResult SCoutInfo(PowderChargeOrder powderChargeOrder) {
return success(powderChargeOrderService.scOutPowderChargeOrder(powderChargeOrder));
}
//出库记录
@PostMapping("/getSCoutInfoRecord")
public AjaxResult getSCoutInfoRecord(PowderChargeOrder powderChargeOrder) {
return success(powderChargeOrderService.getSCoutInfoRecord(powderChargeOrder));
}
}

@ -48,6 +48,16 @@ public class PowderChargeOrder extends BaseEntity {
/** 单位 */
@Excel(name = "单位")
private String Unit;
@Excel(name = "库位")
private String wlCode;
public String getWlCode() {
return wlCode;
}
public void setWlCode(String wlCode) {
this.wlCode = wlCode;
}
/** 实际数量 */
@Excel(name = "实际数量")

@ -6,14 +6,14 @@ import com.op.wms.domain.PowderChargeOrder;
/**
* Mapper
*
*
* @author Open Platform
* @date 2023-07-10
*/
public interface PowderChargeOrderMapper {
/**
*
*
*
* @param ID
* @return
*/
@ -21,7 +21,7 @@ public interface PowderChargeOrderMapper {
/**
*
*
*
* @param powderChargeOrder
* @return
*/
@ -29,7 +29,7 @@ public interface PowderChargeOrderMapper {
/**
*
*
*
* @param powderChargeOrder
* @return
*/
@ -37,7 +37,7 @@ public interface PowderChargeOrderMapper {
/**
*
*
*
* @param powderChargeOrder
* @return
*/
@ -45,7 +45,7 @@ public interface PowderChargeOrderMapper {
/**
*
*
*
* @param ID
* @return
*/
@ -53,9 +53,15 @@ public interface PowderChargeOrderMapper {
/**
*
*
*
* @param IDs
* @return
*/
public int deletePowderChargeOrderByIDs(String[] IDs);
public PowderChargeOrder selectPowderChargeOrderByOrderCode(String orderCode);
void updatePowderChargeOrderTon(PowderChargeOrder powderChargeOrder);
void updateOdsRawStorageNews(PowderChargeOrder powderChargeOrder);
}

@ -0,0 +1,18 @@
package com.op.wms.mapper;
import com.op.wms.domain.PowderChargeOrder;
import java.util.List;
/**
* Mapper
*
* @author Open Platform
* @date 2023-07-10
*/
public interface PowderChargeOrderRecordMapper {
Integer insertPowderChargeOrderRecord(PowderChargeOrder powderChargeOrder);
List<PowderChargeOrder> selectPowderChargeOrderRecordList(PowderChargeOrder powderChargeOrder);
}

@ -13,7 +13,7 @@ import com.op.wms.service.IBaseAreaService;
/**
* Service
*
*
* @author Open Platform
* @date 2023-07-04
*/
@ -24,7 +24,7 @@ public class BaseAreaServiceImpl implements IBaseAreaService {
/**
*
*
*
* @param areaId
* @return
*/
@ -36,7 +36,7 @@ public class BaseAreaServiceImpl implements IBaseAreaService {
/**
*
*
*
* @param baseArea
* @return
*/
@ -48,7 +48,7 @@ public class BaseAreaServiceImpl implements IBaseAreaService {
/**
*
*
*
* @param baseArea
* @return
*/
@ -65,7 +65,7 @@ public class BaseAreaServiceImpl implements IBaseAreaService {
/**
*
*
*
* @param baseArea
* @return
*/
@ -79,7 +79,7 @@ public class BaseAreaServiceImpl implements IBaseAreaService {
/**
*
*
*
* @param areaIds
* @return
*/
@ -91,7 +91,7 @@ public class BaseAreaServiceImpl implements IBaseAreaService {
/**
*
*
*
* @param areaId
* @return
*/

@ -13,7 +13,7 @@ import com.op.wms.service.IBaseLocationService;
/**
* Service
*
*
* @author Open Platform
* @date 2023-07-06
*/
@ -24,7 +24,7 @@ public class BaseLocationServiceImpl implements IBaseLocationService {
/**
*
*
*
* @param locationId
* @return
*/
@ -36,7 +36,7 @@ public class BaseLocationServiceImpl implements IBaseLocationService {
/**
*
*
*
* @param baseLocation
* @return
*/
@ -48,7 +48,7 @@ public class BaseLocationServiceImpl implements IBaseLocationService {
/**
*
*
*
* @param baseLocation
* @return
*/
@ -62,7 +62,7 @@ public class BaseLocationServiceImpl implements IBaseLocationService {
/**
*
*
*
* @param baseLocation
* @return
*/
@ -76,7 +76,7 @@ public class BaseLocationServiceImpl implements IBaseLocationService {
/**
*
*
*
* @param locationIds
* @return
*/
@ -88,7 +88,7 @@ public class BaseLocationServiceImpl implements IBaseLocationService {
/**
*
*
*
* @param locationId
* @return
*/

@ -6,6 +6,7 @@ import java.util.Date;
import java.util.List;
import java.util.UUID;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.context.SecurityContextHolder;
import com.op.common.core.web.domain.AjaxResult;
import com.op.wms.domain.OdsRawStorageNews;
@ -39,6 +40,7 @@ public class BasePowderOrderServiceImpl implements IBasePowderOrderService {
* @return
*/
@Override
@DS("#header.poolName")
public BasePowderOrder selectBasePowderOrderByID(String ID) {
return basePowderOrderMapper.selectBasePowderOrderByID(ID);
}
@ -50,6 +52,7 @@ public class BasePowderOrderServiceImpl implements IBasePowderOrderService {
* @return
*/
@Override
@DS("#header.poolName")
public List<BasePowderOrder> selectBasePowderOrderList(BasePowderOrder basePowderOrder) {
return basePowderOrderMapper.selectBasePowderOrderList(basePowderOrder);
}
@ -61,6 +64,7 @@ public class BasePowderOrderServiceImpl implements IBasePowderOrderService {
* @return
*/
@Override
@DS("#header.poolName")
public int insertBasePowderOrder(BasePowderOrder basePowderOrder) {
String userName = SecurityContextHolder.getUserName();
basePowderOrder.setID(UUID.randomUUID().toString());
@ -75,7 +79,7 @@ public class BasePowderOrderServiceImpl implements IBasePowderOrderService {
}
@DS("#header.poolName")
private String getPurcode(String factorycode, String orderType) {
String purcode = "";
@ -118,6 +122,7 @@ public class BasePowderOrderServiceImpl implements IBasePowderOrderService {
* @return
*/
@Override
@DS("#header.poolName")
public int updateBasePowderOrder(BasePowderOrder basePowderOrder) {
return basePowderOrderMapper.updateBasePowderOrder(basePowderOrder);
}
@ -129,6 +134,7 @@ public class BasePowderOrderServiceImpl implements IBasePowderOrderService {
* @return
*/
@Override
@DS("#header.poolName")
public int deleteBasePowderOrderByIDs(String[] IDs) {
return basePowderOrderMapper.deleteBasePowderOrderByIDs(IDs);
}
@ -140,12 +146,14 @@ public class BasePowderOrderServiceImpl implements IBasePowderOrderService {
* @return
*/
@Override
@DS("#header.poolName")
public int deleteBasePowderOrderByID(String ID) {
return basePowderOrderMapper.deleteBasePowderOrderByID(ID);
}
@Transactional
@Override
@DS("#header.poolName")
public int confirmReceipt(BasePowderOrder basePowderOrder) {
BasePowderOrder basePowderOrder1 = new BasePowderOrder();
String siteCode = basePowderOrder.getSiteCode();
@ -189,6 +197,7 @@ public class BasePowderOrderServiceImpl implements IBasePowderOrderService {
}
@Transactional
@Override
@DS("#header.poolName")
public AjaxResult powderReturn(String[] iDs) {
for (String id:
iDs) {//只退回不合格的

@ -15,7 +15,7 @@ import com.op.wms.service.IBaseShiftsTService;
/**
* Service
*
*
* @author Open Platform
* @date 2023-07-06
*/
@ -26,7 +26,7 @@ public class BaseShiftsTServiceImpl implements IBaseShiftsTService {
/**
*
*
*
* @param shiftId
* @return
*/
@ -38,7 +38,7 @@ public class BaseShiftsTServiceImpl implements IBaseShiftsTService {
/**
*
*
*
* @param baseShiftsT
* @return
*/
@ -50,7 +50,7 @@ public class BaseShiftsTServiceImpl implements IBaseShiftsTService {
/**
*
*
*
* @param baseShiftsT
* @return
*/
@ -107,7 +107,7 @@ public class BaseShiftsTServiceImpl implements IBaseShiftsTService {
/*
*
*
*
* @param baseShiftsT
* @return
*/
@ -121,7 +121,7 @@ public class BaseShiftsTServiceImpl implements IBaseShiftsTService {
/**
*
*
*
* @param shiftIds
* @return
*/
@ -133,7 +133,7 @@ public class BaseShiftsTServiceImpl implements IBaseShiftsTService {
/**
*
*
*
* @param shiftId
* @return
*/

@ -13,7 +13,7 @@ import com.op.wms.service.IBaseTeamTService;
/**
* Service
*
*
* @author Open Platform
* @date 2023-07-05
*/
@ -24,7 +24,7 @@ public class BaseTeamTServiceImpl implements IBaseTeamTService {
/**
*
*
*
* @param teamId
* @return
*/
@ -36,7 +36,7 @@ public class BaseTeamTServiceImpl implements IBaseTeamTService {
/**
*
*
*
* @param baseTeamT
* @return
*/
@ -48,7 +48,7 @@ public class BaseTeamTServiceImpl implements IBaseTeamTService {
/**
*
*
*
* @param baseTeamT
* @return
*/
@ -62,7 +62,7 @@ public class BaseTeamTServiceImpl implements IBaseTeamTService {
/**
*
*
*
* @param baseTeamT
* @return
*/
@ -76,7 +76,7 @@ public class BaseTeamTServiceImpl implements IBaseTeamTService {
/**
*
*
*
* @param teamIds
* @return
*/
@ -88,7 +88,7 @@ public class BaseTeamTServiceImpl implements IBaseTeamTService {
/**
*
*
*
* @param teamId
* @return
*/

@ -13,7 +13,7 @@ import com.op.wms.service.IBaseWarehouseService;
/**
* Service
*
*
* @author Open Platform
* @date 2023-07-04
*/
@ -24,7 +24,7 @@ public class BaseWarehouseServiceImpl implements IBaseWarehouseService {
/**
*
*
*
* @param warehouseId
* @return
*/
@ -36,7 +36,7 @@ public class BaseWarehouseServiceImpl implements IBaseWarehouseService {
/**
*
*
*
* @param baseWarehouse
* @return
*/
@ -48,7 +48,7 @@ public class BaseWarehouseServiceImpl implements IBaseWarehouseService {
/**
*
*
*
* @param baseWarehouse
* @return
*/
@ -65,7 +65,7 @@ public class BaseWarehouseServiceImpl implements IBaseWarehouseService {
/**
*
*
*
* @param baseWarehouse
* @return
*/
@ -79,7 +79,7 @@ public class BaseWarehouseServiceImpl implements IBaseWarehouseService {
/**
*
*
*
* @param warehouseIds
* @return
*/
@ -91,7 +91,7 @@ public class BaseWarehouseServiceImpl implements IBaseWarehouseService {
/**
*
*
*
* @param warehouseId
* @return
*/

@ -1,6 +1,8 @@
package com.op.wms.service.impl;
import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DS;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.op.wms.mapper.OdsInventoryOrderMapper;
@ -9,7 +11,7 @@ import com.op.wms.service.IOdsInventoryOrderService;
/**
* Service
*
*
* @author Open Platform
* @date 2023-07-06
*/
@ -20,66 +22,72 @@ public class OdsInventoryOrderServiceImpl implements IOdsInventoryOrderService {
/**
*
*
*
* @param ID
* @return
*/
@Override
@DS("#header.poolName")
public OdsInventoryOrder selectOdsInventoryOrderByID(String ID) {
return odsInventoryOrderMapper.selectOdsInventoryOrderByID(ID);
}
/**
*
*
*
* @param odsInventoryOrder
* @return
*/
@Override
@DS("#header.poolName")
public List<OdsInventoryOrder> selectOdsInventoryOrderList(OdsInventoryOrder odsInventoryOrder) {
return odsInventoryOrderMapper.selectOdsInventoryOrderList(odsInventoryOrder);
}
/**
*
*
*
* @param odsInventoryOrder
* @return
*/
@Override
@DS("#header.poolName")
public int insertOdsInventoryOrder(OdsInventoryOrder odsInventoryOrder) {
return odsInventoryOrderMapper.insertOdsInventoryOrder(odsInventoryOrder);
}
/**
*
*
*
* @param odsInventoryOrder
* @return
*/
@Override
@DS("#header.poolName")
public int updateOdsInventoryOrder(OdsInventoryOrder odsInventoryOrder) {
return odsInventoryOrderMapper.updateOdsInventoryOrder(odsInventoryOrder);
}
/**
*
*
*
* @param IDs
* @return
*/
@Override
@DS("#header.poolName")
public int deleteOdsInventoryOrderByIDs(String[] IDs) {
return odsInventoryOrderMapper.deleteOdsInventoryOrderByIDs(IDs);
}
/**
*
*
*
* @param ID
* @return
*/
@Override
@DS("#header.poolName")
public int deleteOdsInventoryOrderByID(String ID) {
return odsInventoryOrderMapper.deleteOdsInventoryOrderByID(ID);
}

@ -1,6 +1,8 @@
package com.op.wms.service.impl;
import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DS;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.op.wms.mapper.OdsProcureOrderMapper;
@ -9,7 +11,7 @@ import com.op.wms.service.IOdsProcureOrderService;
/**
* Service
*
*
* @author Open Platform
* @date 2023-07-06
*/
@ -20,66 +22,72 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
/**
*
*
*
* @param ID
* @return
*/
@Override
@DS("#header.poolName")
public OdsProcureOrder selectOdsProcureOrderByID(String ID) {
return odsProcureOrderMapper.selectOdsProcureOrderByID(ID);
}
/**
*
*
*
* @param odsProcureOrder
* @return
*/
@Override
@DS("#header.poolName")
public List<OdsProcureOrder> selectOdsProcureOrderList(OdsProcureOrder odsProcureOrder) {
return odsProcureOrderMapper.selectOdsProcureOrderList(odsProcureOrder);
}
/**
*
*
*
* @param odsProcureOrder
* @return
*/
@Override
@DS("#header.poolName")
public int insertOdsProcureOrder(OdsProcureOrder odsProcureOrder) {
return odsProcureOrderMapper.insertOdsProcureOrder(odsProcureOrder);
}
/**
*
*
*
* @param odsProcureOrder
* @return
*/
@Override
@DS("#header.poolName")
public int updateOdsProcureOrder(OdsProcureOrder odsProcureOrder) {
return odsProcureOrderMapper.updateOdsProcureOrder(odsProcureOrder);
}
/**
*
*
*
* @param IDs
* @return
*/
@Override
@DS("#header.poolName")
public int deleteOdsProcureOrderByIDs(String[] IDs) {
return odsProcureOrderMapper.deleteOdsProcureOrderByIDs(IDs);
}
/**
*
*
*
* @param ID
* @return
*/
@Override
@DS("#header.poolName")
public int deleteOdsProcureOrderByID(String ID) {
return odsProcureOrderMapper.deleteOdsProcureOrderByID(ID);
}

@ -1,6 +1,8 @@
package com.op.wms.service.impl;
import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DS;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.op.wms.mapper.OdsProcureOutOrderMapper;
@ -9,7 +11,7 @@ import com.op.wms.service.IOdsProcureOutOrderService;
/**
* Service
*
*
* @author Open Platform
* @date 2023-07-06
*/
@ -20,66 +22,72 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService
/**
*
*
*
* @param ID
* @return
*/
@Override
@DS("#header.poolName")
public OdsProcureOutOrder selectOdsProcureOutOrderByID(String ID) {
return odsProcureOutOrderMapper.selectOdsProcureOutOrderByID(ID);
}
/**
*
*
*
* @param odsProcureOutOrder
* @return
*/
@Override
@DS("#header.poolName")
public List<OdsProcureOutOrder> selectOdsProcureOutOrderList(OdsProcureOutOrder odsProcureOutOrder) {
return odsProcureOutOrderMapper.selectOdsProcureOutOrderList(odsProcureOutOrder);
}
/**
*
*
*
* @param odsProcureOutOrder
* @return
*/
@Override
@DS("#header.poolName")
public int insertOdsProcureOutOrder(OdsProcureOutOrder odsProcureOutOrder) {
return odsProcureOutOrderMapper.insertOdsProcureOutOrder(odsProcureOutOrder);
}
/**
*
*
*
* @param odsProcureOutOrder
* @return
*/
@Override
@DS("#header.poolName")
public int updateOdsProcureOutOrder(OdsProcureOutOrder odsProcureOutOrder) {
return odsProcureOutOrderMapper.updateOdsProcureOutOrder(odsProcureOutOrder);
}
/**
*
*
*
* @param IDs
* @return
*/
@Override
@DS("#header.poolName")
public int deleteOdsProcureOutOrderByIDs(String[] IDs) {
return odsProcureOutOrderMapper.deleteOdsProcureOutOrderByIDs(IDs);
}
/**
*
*
*
* @param ID
* @return
*/
@Override
@DS("#header.poolName")
public int deleteOdsProcureOutOrderByID(String ID) {
return odsProcureOutOrderMapper.deleteOdsProcureOutOrderByID(ID);
}

@ -1,6 +1,8 @@
package com.op.wms.service.impl;
import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DS;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.op.wms.mapper.OdsWhiteEmbryoInventoryMapper;
@ -9,7 +11,7 @@ import com.op.wms.service.IOdsWhiteEmbryoInventoryService;
/**
* Service
*
*
* @author Open Platform
* @date 2023-07-06
*/
@ -20,66 +22,72 @@ public class OdsWhiteEmbryoInventoryServiceImpl implements IOdsWhiteEmbryoInvent
/**
*
*
*
* @param ID
* @return
*/
@Override
@DS("#header.poolName")
public OdsWhiteEmbryoInventory selectOdsWhiteEmbryoInventoryByID(String ID) {
return odsWhiteEmbryoInventoryMapper.selectOdsWhiteEmbryoInventoryByID(ID);
}
/**
*
*
*
* @param odsWhiteEmbryoInventory
* @return
*/
@Override
@DS("#header.poolName")
public List<OdsWhiteEmbryoInventory> selectOdsWhiteEmbryoInventoryList(OdsWhiteEmbryoInventory odsWhiteEmbryoInventory) {
return odsWhiteEmbryoInventoryMapper.selectOdsWhiteEmbryoInventoryList(odsWhiteEmbryoInventory);
}
/**
*
*
*
* @param odsWhiteEmbryoInventory
* @return
*/
@Override
@DS("#header.poolName")
public int insertOdsWhiteEmbryoInventory(OdsWhiteEmbryoInventory odsWhiteEmbryoInventory) {
return odsWhiteEmbryoInventoryMapper.insertOdsWhiteEmbryoInventory(odsWhiteEmbryoInventory);
}
/**
*
*
*
* @param odsWhiteEmbryoInventory
* @return
*/
@Override
@DS("#header.poolName")
public int updateOdsWhiteEmbryoInventory(OdsWhiteEmbryoInventory odsWhiteEmbryoInventory) {
return odsWhiteEmbryoInventoryMapper.updateOdsWhiteEmbryoInventory(odsWhiteEmbryoInventory);
}
/**
*
*
*
* @param IDs
* @return
*/
@Override
@DS("#header.poolName")
public int deleteOdsWhiteEmbryoInventoryByIDs(String[] IDs) {
return odsWhiteEmbryoInventoryMapper.deleteOdsWhiteEmbryoInventoryByIDs(IDs);
}
/**
*
*
*
* @param ID
* @return
*/
@Override
@DS("#header.poolName")
public int deleteOdsWhiteEmbryoInventoryByID(String ID) {
return odsWhiteEmbryoInventoryMapper.deleteOdsWhiteEmbryoInventoryByID(ID);
}

@ -1,6 +1,8 @@
package com.op.wms.service.impl;
import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DS;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.op.wms.mapper.OdsWhiteEmbryoMapper;
@ -9,7 +11,7 @@ import com.op.wms.service.IOdsWhiteEmbryoService;
/**
* Service
*
*
* @author Open Platform
* @date 2023-07-06
*/
@ -20,66 +22,72 @@ public class OdsWhiteEmbryoServiceImpl implements IOdsWhiteEmbryoService {
/**
*
*
*
* @param ID
* @return
*/
@Override
@DS("#header.poolName")
public OdsWhiteEmbryo selectOdsWhiteEmbryoByID(String ID) {
return odsWhiteEmbryoMapper.selectOdsWhiteEmbryoByID(ID);
}
/**
*
*
*
* @param odsWhiteEmbryo
* @return
*/
@Override
@DS("#header.poolName")
public List<OdsWhiteEmbryo> selectOdsWhiteEmbryoList(OdsWhiteEmbryo odsWhiteEmbryo) {
return odsWhiteEmbryoMapper.selectOdsWhiteEmbryoList(odsWhiteEmbryo);
}
/**
*
*
*
* @param odsWhiteEmbryo
* @return
*/
@Override
@DS("#header.poolName")
public int insertOdsWhiteEmbryo(OdsWhiteEmbryo odsWhiteEmbryo) {
return odsWhiteEmbryoMapper.insertOdsWhiteEmbryo(odsWhiteEmbryo);
}
/**
*
*
*
* @param odsWhiteEmbryo
* @return
*/
@Override
@DS("#header.poolName")
public int updateOdsWhiteEmbryo(OdsWhiteEmbryo odsWhiteEmbryo) {
return odsWhiteEmbryoMapper.updateOdsWhiteEmbryo(odsWhiteEmbryo);
}
/**
*
*
*
* @param IDs
* @return
*/
@Override
@DS("#header.poolName")
public int deleteOdsWhiteEmbryoByIDs(String[] IDs) {
return odsWhiteEmbryoMapper.deleteOdsWhiteEmbryoByIDs(IDs);
}
/**
*
*
*
* @param ID
* @return
*/
@Override
@DS("#header.poolName")
public int deleteOdsWhiteEmbryoByID(String ID) {
return odsWhiteEmbryoMapper.deleteOdsWhiteEmbryoByID(ID);
}

@ -1,15 +1,26 @@
package com.op.wms.service.impl;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.UUID;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.context.SecurityContextHolder;
import com.op.wms.domain.Purcode;
import com.op.wms.mapper.PowderChargeOrderRecordMapper;
import com.op.wms.mapper.PurcodeMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.op.wms.mapper.PowderChargeOrderMapper;
import com.op.wms.domain.PowderChargeOrder;
import com.op.wms.service.IPowderChargeOrderService;
import org.springframework.transaction.annotation.Transactional;
/**
* Service
*
*
* @author Open Platform
* @date 2023-07-10
*/
@ -18,69 +29,180 @@ public class PowderChargeOrderServiceImpl implements IPowderChargeOrderService {
@Autowired
private PowderChargeOrderMapper powderChargeOrderMapper;
@Autowired
private PurcodeMapper purcodeMapper;
@Autowired
private PowderChargeOrderRecordMapper powderChargeOrderRecordMapper;
/**
*
*
*
* @param ID
* @return
*/
@Override
@DS("#header.poolName")
public PowderChargeOrder selectPowderChargeOrderByID(String ID) {
return powderChargeOrderMapper.selectPowderChargeOrderByID(ID);
}
/**
*
*
*
* @param powderChargeOrder
* @return
*/
@Override
@DS("#header.poolName")
public List<PowderChargeOrder> selectPowderChargeOrderList(PowderChargeOrder powderChargeOrder) {
return powderChargeOrderMapper.selectPowderChargeOrderList(powderChargeOrder);
}
/**
*
*
*
* @param powderChargeOrder
* @return
*/
@Override
@DS("#header.poolName")
public int insertPowderChargeOrder(PowderChargeOrder powderChargeOrder) {
return powderChargeOrderMapper.insertPowderChargeOrder(powderChargeOrder);
}
/**
*
*
*
* @param powderChargeOrder
* @return
*/
@Override
@DS("#header.poolName")
public int updatePowderChargeOrder(PowderChargeOrder powderChargeOrder) {
return powderChargeOrderMapper.updatePowderChargeOrder(powderChargeOrder);
}
/**
*
*
*
* @param IDs
* @return
*/
@Override
@DS("#header.poolName")
public int deletePowderChargeOrderByIDs(String[] IDs) {
return powderChargeOrderMapper.deletePowderChargeOrderByIDs(IDs);
}
/**
*
*
*
* @param ID
* @return
*/
@Override
@DS("#header.poolName")
public int deletePowderChargeOrderByID(String ID) {
return powderChargeOrderMapper.deletePowderChargeOrderByID(ID);
}
@Override
@DS("#header.poolName")
public int insertPowderChargeOrderAdd(List<PowderChargeOrder> powderChargeOrders) {
String userName = SecurityContextHolder.getUserName();
Integer tem=0;
for (PowderChargeOrder powderChargeOrder:
powderChargeOrders) {
String orderCode =getPurcode(null,"PL");
powderChargeOrder.setID(UUID.randomUUID().toString());
powderChargeOrder.setCreateDate(new Date());
powderChargeOrder.setOrderCode(orderCode);
powderChargeOrder.setOrderStatus("1");
powderChargeOrder.setCreateBy(userName);
powderChargeOrder.setActive("1");
powderChargeOrder.setUserDefined1("PL");
tem = powderChargeOrderMapper.insertPowderChargeOrder(powderChargeOrder);
}
return tem;
}
@Override
@DS("#header.poolName")
public PowderChargeOrder selectPowderChargeOrderByOrderCode(String orderCode) {
return powderChargeOrderMapper.selectPowderChargeOrderByOrderCode(orderCode);
}
/**.1------
* 23
* --,,
* @param powderChargeOrder
* @return
*/
@Transactional
@Override
@DS("#header.poolName")
public int scOutPowderChargeOrder(PowderChargeOrder powderChargeOrder) {
PowderChargeOrder powderChargeOrder1 =powderChargeOrderMapper.selectPowderChargeOrderByID(powderChargeOrder.getID());
BigDecimal realityNumber1 = powderChargeOrder1.getRealityNumber();//累计投料数
BigDecimal realityNumber = powderChargeOrder.getRealityNumber();
BigDecimal planNumber =powderChargeOrder1.getPlanNumber();
boolean isEqual = realityNumber1.add(realityNumber).equals(planNumber);
// 判断realityNumber1 加 realityNumber 是否等于 planNumber
// 如果等于则返回true否则返回false
if (isEqual){
powderChargeOrder.setOrderStatus("3");
}else {
powderChargeOrder.setOrderStatus("2");
}
powderChargeOrderMapper.updatePowderChargeOrderTon(powderChargeOrder);
powderChargeOrderMapper.updateOdsRawStorageNews(powderChargeOrder);
powderChargeOrder.setID(UUID.randomUUID().toString());
Integer tem = powderChargeOrderRecordMapper.insertPowderChargeOrderRecord(powderChargeOrder);
return tem;
}
@Override
public List<PowderChargeOrder> getSCoutInfoRecord(PowderChargeOrder powderChargeOrder) {
return powderChargeOrderRecordMapper.selectPowderChargeOrderRecordList(powderChargeOrder);
}
@DS("#header.poolName")
private String getPurcode(String factorycode, String orderType) {
String purcode = "";
String curDate = new SimpleDateFormat("yyyyMMdd").format(new Date());
Integer vaule = purcodeMapper.queryCurValue(orderType, curDate);
if (vaule == null) {
Purcode purcodeO = new Purcode();
purcodeO.setCurDate(curDate);
purcodeO.setOrderType(orderType);
purcodeO.setValue(1);
int count = purcodeMapper.insert(purcodeO);
if (count != 1) {
return "";
}
if (factorycode != null && !factorycode.equals("")) {
purcode = orderType + factorycode + curDate.substring(2) + String.format("%04d", 1);
} else {
purcode = orderType + curDate.substring(2) + String.format("%04d", 1);
}
} else {
int count = purcodeMapper.updateCurValue(orderType, curDate, vaule);
if (count != 1) {
return "";
}
if (factorycode != null && !factorycode.equals("")) {
purcode = orderType + factorycode + curDate.substring(2) + String.format("%04d", vaule + 1);
} else {
purcode = orderType + curDate.substring(2) + String.format("%04d", vaule + 1);
}
}
return purcode;
}
}

@ -13,7 +13,7 @@ import com.op.wms.service.ISysFactoryService;
/**
* Service
*
*
* @author Open Platform
* @date 2023-07-03
*/
@ -24,7 +24,7 @@ public class SysFactoryServiceImpl implements ISysFactoryService {
/**
*
*
*
* @param factoryId
* @return
*/
@ -36,7 +36,7 @@ public class SysFactoryServiceImpl implements ISysFactoryService {
/**
*
*
*
* @param sysFactory
* @return
*/
@ -48,7 +48,7 @@ public class SysFactoryServiceImpl implements ISysFactoryService {
/**
*
*
*
* @param sysFactory
* @return
*/
@ -62,7 +62,7 @@ public class SysFactoryServiceImpl implements ISysFactoryService {
/**
*
*
*
* @param sysFactory
* @return
*/
@ -76,7 +76,7 @@ public class SysFactoryServiceImpl implements ISysFactoryService {
/**
*
*
*
* @param factoryIds
* @return
*/
@ -88,7 +88,7 @@ public class SysFactoryServiceImpl implements ISysFactoryService {
/**
*
*
*
* @param factoryId
* @return
*/

@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.op.wms.mapper.PowderChargeOrderMapper">
<resultMap type="PowderChargeOrder" id="PowderChargeOrderResult">
<result property="siteCode" column="Site_code" />
<result property="ID" column="ID" />
@ -36,15 +36,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="Active" column="Active" />
<result property="enterpriseId" column="Enterprise_Id" />
<result property="enterpriseCode" column="Enterprise_Code" />
<result property="wlCode" column="wl_code" />
</resultMap>
<sql id="selectPowderChargeOrderVo">
select Site_code, ID, Order_Code, Material_Code, Material_Desc, Plan_Date, Plan_Number, Unit, Reality_Number, Order_Status, User_Defined1, User_Defined2, User_Defined3, User_Defined4, User_Defined5, User_Defined6, User_Defined7, User_Defined8, User_Defined9, User_Defined10, User_Defined11, Supplier_Code, Supplier_Name, Remark, Create_By, Create_Date, Last_Update_By, Last_Update_Date, Active, Enterprise_Id, Enterprise_Code from powder_charge_order
select Site_code, ID, Order_Code, Material_Code, Material_Desc, Plan_Date, Plan_Number, Unit, Reality_Number, Order_Status, User_Defined1, User_Defined2, User_Defined3, User_Defined4, User_Defined5, User_Defined6, User_Defined7, User_Defined8, User_Defined9, User_Defined10, User_Defined11, Supplier_Code, Supplier_Name, Remark, Create_By, Create_Date, Last_Update_By, Last_Update_Date, Active, Enterprise_Id, Enterprise_Code,wl_code from powder_charge_order
</sql>
<select id="selectPowderChargeOrderList" parameterType="PowderChargeOrder" resultMap="PowderChargeOrderResult">
<include refid="selectPowderChargeOrderVo"/>
<where>
<where>
<if test="siteCode != null and siteCode != ''"> and Site_code = #{siteCode}</if>
<if test="orderCode != null and orderCode != ''"> and Order_Code = #{orderCode}</if>
<if test="materialCode != null and materialCode != ''"> and Material_Code = #{materialCode}</if>
@ -77,12 +78,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="enterpriseCode != null and enterpriseCode != ''"> and Enterprise_Code = #{enterpriseCode}</if>
</where>
</select>
<select id="selectPowderChargeOrderByID" parameterType="String" resultMap="PowderChargeOrderResult">
<include refid="selectPowderChargeOrderVo"/>
where ID = #{ID}
</select>
<select id="selectPowderChargeOrderByOrderCode" parameterType="String" resultMap="PowderChargeOrderResult">
<include refid="selectPowderChargeOrderVo"/>
where Order_Code = #{orderCode}
</select>
<insert id="insertPowderChargeOrder" parameterType="PowderChargeOrder">
insert into powder_charge_order
<trim prefix="(" suffix=")" suffixOverrides=",">
@ -117,6 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="Active != null">Active,</if>
<if test="enterpriseId != null">Enterprise_Id,</if>
<if test="enterpriseCode != null">Enterprise_Code,</if>
<if test="wlCode != null">wl_code,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="siteCode != null">#{siteCode},</if>
@ -150,6 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="Active != null">#{Active},</if>
<if test="enterpriseId != null">#{enterpriseId},</if>
<if test="enterpriseCode != null">#{enterpriseCode},</if>
<if test="wlCode != null">#{wlCode},</if>
</trim>
</insert>
@ -195,9 +201,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deletePowderChargeOrderByIDs" parameterType="String">
delete from powder_charge_order where ID in
delete from powder_charge_order where ID in
<foreach item="ID" collection="array" open="(" separator="," close=")">
#{ID}
</foreach>
</delete>
</mapper>
<update id="updatePowderChargeOrderTon"> update powder_charge_order set Reality_Number =Reality_Number+ #{realityNumber},
Order_Status = #{orderStatus},
Last_Update_Date = now()
where ID=#{ID}
</update>
<update id="updateOdsRawStorageNews"> update ods_raw_storage_news set storage_amount =storage_amount- #{realityNumber},
gmt_modified = now()
where material_code=#{materialCode} AND wl_code=#{wlCode} </update>
</mapper>

@ -0,0 +1,150 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.op.wms.mapper.PowderChargeOrderRecordMapper">
<resultMap type="PowderChargeOrder" id="PowderChargeOrderResult">
<result property="siteCode" column="Site_code" />
<result property="ID" column="ID" />
<result property="orderCode" column="Order_Code" />
<result property="materialCode" column="Material_Code" />
<result property="materialDesc" column="Material_Desc" />
<result property="planDate" column="Plan_Date" />
<result property="planNumber" column="Plan_Number" />
<result property="Unit" column="Unit" />
<result property="realityNumber" column="Reality_Number" />
<result property="orderStatus" column="Order_Status" />
<result property="userDefined1" column="User_Defined1" />
<result property="userDefined2" column="User_Defined2" />
<result property="userDefined3" column="User_Defined3" />
<result property="userDefined4" column="User_Defined4" />
<result property="userDefined5" column="User_Defined5" />
<result property="userDefined6" column="User_Defined6" />
<result property="userDefined7" column="User_Defined7" />
<result property="userDefined8" column="User_Defined8" />
<result property="userDefined9" column="User_Defined9" />
<result property="userDefined10" column="User_Defined10" />
<result property="userDefined11" column="User_Defined11" />
<result property="supplierCode" column="Supplier_Code" />
<result property="supplierName" column="Supplier_Name" />
<result property="Remark" column="Remark" />
<result property="createBy" column="Create_By" />
<result property="createDate" column="Create_Date" />
<result property="lastUpdateBy" column="Last_Update_By" />
<result property="lastUpdateDate" column="Last_Update_Date" />
<result property="Active" column="Active" />
<result property="enterpriseId" column="Enterprise_Id" />
<result property="enterpriseCode" column="Enterprise_Code" />
<result property="wlCode" column="wl_code" />
</resultMap>
<insert id="insertPowderChargeOrderRecord" parameterType="PowderChargeOrder">
insert into powder_charge_order_record
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="siteCode != null">Site_code,</if>
<if test="ID != null">ID,</if>
<if test="orderCode != null">Order_Code,</if>
<if test="materialCode != null">Material_Code,</if>
<if test="materialDesc != null">Material_Desc,</if>
<if test="planDate != null">Plan_Date,</if>
<if test="planNumber != null">Plan_Number,</if>
<if test="Unit != null">Unit,</if>
<if test="realityNumber != null">Reality_Number,</if>
<if test="orderStatus != null">Order_Status,</if>
<if test="userDefined1 != null">User_Defined1,</if>
<if test="userDefined2 != null">User_Defined2,</if>
<if test="userDefined3 != null">User_Defined3,</if>
<if test="userDefined4 != null">User_Defined4,</if>
<if test="userDefined5 != null">User_Defined5,</if>
<if test="userDefined6 != null">User_Defined6,</if>
<if test="userDefined7 != null">User_Defined7,</if>
<if test="userDefined8 != null">User_Defined8,</if>
<if test="userDefined9 != null">User_Defined9,</if>
<if test="userDefined10 != null">User_Defined10,</if>
<if test="userDefined11 != null">User_Defined11,</if>
<if test="supplierCode != null">Supplier_Code,</if>
<if test="supplierName != null">Supplier_Name,</if>
<if test="Remark != null">Remark,</if>
<if test="createBy != null">Create_By,</if>
<if test="createDate != null">Create_Date,</if>
<if test="lastUpdateBy != null">Last_Update_By,</if>
<if test="lastUpdateDate != null">Last_Update_Date,</if>
<if test="Active != null">Active,</if>
<if test="enterpriseId != null">Enterprise_Id,</if>
<if test="enterpriseCode != null">Enterprise_Code,</if>
<if test="wlCode != null">wl_code,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="siteCode != null">#{siteCode},</if>
<if test="ID != null">#{ID},</if>
<if test="orderCode != null">#{orderCode},</if>
<if test="materialCode != null">#{materialCode},</if>
<if test="materialDesc != null">#{materialDesc},</if>
<if test="planDate != null">#{planDate},</if>
<if test="planNumber != null">#{planNumber},</if>
<if test="Unit != null">#{Unit},</if>
<if test="realityNumber != null">#{realityNumber},</if>
<if test="orderStatus != null">#{orderStatus},</if>
<if test="userDefined1 != null">#{userDefined1},</if>
<if test="userDefined2 != null">#{userDefined2},</if>
<if test="userDefined3 != null">#{userDefined3},</if>
<if test="userDefined4 != null">#{userDefined4},</if>
<if test="userDefined5 != null">#{userDefined5},</if>
<if test="userDefined6 != null">#{userDefined6},</if>
<if test="userDefined7 != null">#{userDefined7},</if>
<if test="userDefined8 != null">#{userDefined8},</if>
<if test="userDefined9 != null">#{userDefined9},</if>
<if test="userDefined10 != null">#{userDefined10},</if>
<if test="userDefined11 != null">#{userDefined11},</if>
<if test="supplierCode != null">#{supplierCode},</if>
<if test="supplierName != null">#{supplierName},</if>
<if test="Remark != null">#{Remark},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createDate != null">#{createDate},</if>
<if test="lastUpdateBy != null">#{lastUpdateBy},</if>
<if test="lastUpdateDate != null">#{lastUpdateDate},</if>
<if test="Active != null">#{Active},</if>
<if test="enterpriseId != null">#{enterpriseId},</if>
<if test="enterpriseCode != null">#{enterpriseCode},</if>
<if test="wlCode != null">#{wlCode},</if>
</trim>
</insert>
<sql id="selectPowderChargeOrderRecordVo">
select Site_code, ID, Order_Code, Material_Code, Material_Desc, Plan_Date, Plan_Number, Unit, Reality_Number, Order_Status, User_Defined1, User_Defined2, User_Defined3, User_Defined4, User_Defined5, User_Defined6, User_Defined7, User_Defined8, User_Defined9, User_Defined10, User_Defined11, Supplier_Code, Supplier_Name, Remark, Create_By, Create_Date, Last_Update_By, Last_Update_Date, Active, Enterprise_Id, Enterprise_Code,wl_code from powder_charge_order_record
</sql>
<select id="selectPowderChargeOrderRecordList">
<include refid="selectPowderChargeOrderRecordVo"/>
<where>
<if test="siteCode != null and siteCode != ''"> and Site_code = #{siteCode}</if>
<if test="orderCode != null and orderCode != ''"> and Order_Code = #{orderCode}</if>
<if test="materialCode != null and materialCode != ''"> and Material_Code = #{materialCode}</if>
<if test="materialDesc != null and materialDesc != ''"> and Material_Desc = #{materialDesc}</if>
<if test="planDate != null "> and Plan_Date = #{planDate}</if>
<if test="planNumber != null "> and Plan_Number = #{planNumber}</if>
<if test="Unit != null and Unit != ''"> and Unit = #{Unit}</if>
<if test="realityNumber != null "> and Reality_Number = #{realityNumber}</if>
<if test="orderStatus != null and orderStatus != ''"> and Order_Status = #{orderStatus}</if>
<if test="userDefined1 != null and userDefined1 != ''"> and User_Defined1 = #{userDefined1}</if>
<if test="userDefined2 != null and userDefined2 != ''"> and User_Defined2 = #{userDefined2}</if>
<if test="userDefined3 != null and userDefined3 != ''"> and User_Defined3 = #{userDefined3}</if>
<if test="userDefined4 != null and userDefined4 != ''"> and User_Defined4 = #{userDefined4}</if>
<if test="userDefined5 != null and userDefined5 != ''"> and User_Defined5 = #{userDefined5}</if>
<if test="userDefined6 != null and userDefined6 != ''"> and User_Defined6 = #{userDefined6}</if>
<if test="userDefined7 != null and userDefined7 != ''"> and User_Defined7 = #{userDefined7}</if>
<if test="userDefined8 != null and userDefined8 != ''"> and User_Defined8 = #{userDefined8}</if>
<if test="userDefined9 != null and userDefined9 != ''"> and User_Defined9 = #{userDefined9}</if>
<if test="userDefined10 != null and userDefined10 != ''"> and User_Defined10 = #{userDefined10}</if>
<if test="userDefined11 != null and userDefined11 != ''"> and User_Defined11 = #{userDefined11}</if>
<if test="supplierCode != null and supplierCode != ''"> and Supplier_Code = #{supplierCode}</if>
<if test="supplierName != null and supplierName != ''"> and Supplier_Name like concat('%', #{supplierName}, '%')</if>
<if test="Remark != null and Remark != ''"> and Remark = #{Remark}</if>
<if test="createBy != null and createBy != ''"> and Create_By = #{createBy}</if>
<if test="createDate != null "> and Create_Date = #{createDate}</if>
<if test="lastUpdateBy != null and lastUpdateBy != ''"> and Last_Update_By = #{lastUpdateBy}</if>
<if test="lastUpdateDate != null "> and Last_Update_Date = #{lastUpdateDate}</if>
<if test="Active != null and Active != ''"> and Active = #{Active}</if>
<if test="enterpriseId != null and enterpriseId != ''"> and Enterprise_Id = #{enterpriseId}</if>
<if test="enterpriseCode != null and enterpriseCode != ''"> and Enterprise_Code = #{enterpriseCode}</if>
<if test="wlCode != null and wlCode != ''"> and wl_code = #{wlCode}</if>
</where></select>
</mapper>
Loading…
Cancel
Save