增加备货管理

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/DocumentBomDto.java

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 发货单bom
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="DocumentBomDto", description="发货单bom")
+public class DocumentBomDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "物料编码")
+    private String materialNum;
+
+    @ApiModelProperty(value = "物料名称")
+    private String materialName;
+
+    @ApiModelProperty(value = "物料类型")
+    private String materialType;
+
+    @ApiModelProperty(value = "物料组")
+    private String materialGroup;
+
+    @ApiModelProperty(value = " 需求数量")
+    private Integer demandNumber;
+
+    @ApiModelProperty(value = "单价")
+    private Double unitPrice;
+
+    @ApiModelProperty(value = " 折扣后价格")
+    private Double discountUnitPrice;
+
+    @ApiModelProperty(value = "折扣总额")
+    private Double discountTotal;
+
+    @ApiModelProperty(value = "功率")
+    private Double power;
+
+    @ApiModelProperty(value = "货单id")
+    private Long preparationMoneyId;
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/DocumentStationDto.java

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="DocumentStationDto", description="")
+public class DocumentStationDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "发货单id")
+    private Long preparationMoneyId;
+
+    @ApiModelProperty(value = " 场站id")
+    private Long stationId;
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PreparationMoneyDto.java

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 发货单
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="PreparationMoneyDto", description="发货单")
+public class PreparationMoneyDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = " 单号")
+    private String oddNumbers;
+
+    @ApiModelProperty(value = " 收货地址")
+    private String deliveryAddress;
+
+    @ApiModelProperty(value = "详细地址")
+    private String detailAddress;
+
+    @ApiModelProperty(value = " 下单人")
+    private String orderUser;
+
+    @ApiModelProperty(value = "下单时间")
+    private Date orderTime;
+
+    @ApiModelProperty(value = "经销商id")
+    private String dealerId;
+
+    @ApiModelProperty(value = "经销商名称")
+    private String dealerName;
+
+    @ApiModelProperty(value = " 发货地址")
+    private String sendAddress;
+
+    @ApiModelProperty(value = " 业主类型")
+    private String ownerType;
+
+    @ApiModelProperty(value = "业务员")
+    private String salesman;
+
+    @ApiModelProperty(value = "预估重量")
+    private Double estimatedWeight;
+
+    @ApiModelProperty(value = "备注")
+    private String notes;
+
+    @ApiModelProperty(value = "收货人")
+    private String consignee;
+
+    @ApiModelProperty(value = "收货人手机号")
+    private String consigneePhone;
+
+    @ApiModelProperty(value = "收货人地址")
+    private String consigneeAddress;
+
+    @ApiModelProperty(value = "收货人详细地址")
+    private String consigneeDetailAddress;
+
+    @ApiModelProperty(value = "发货单")
+    private String invoice;
+
+    @ApiModelProperty(value = "收货单")
+    private String receipt;
+
+    @ApiModelProperty(value = "订单状态0未完成1已完成2作废")
+    private Integer documentState;
+
+    @ApiModelProperty(value = "发货状态 0 未发货1已发货")
+    private Integer shipmentStatus;
+
+    @ApiModelProperty(value = "到货状态0未到货1已到货")
+    private Integer receivingStatus;
+
+    @ApiModelProperty(value = "清单价格")
+    private Double inventoryPrice;
+
+    @ApiModelProperty(value = "折扣")
+    private Double discount;
+
+    @ApiModelProperty(value = "促销")
+    private Double promotion;
+
+    @ApiModelProperty(value = "合同价格")
+    private Double contractPrice;
+
+    @ApiModelProperty(value = "总价")
+    private Double totalPrice;
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/DocumentBom.java

+package com.yeejoin.amos.boot.module.hygf.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 发货单bom
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("hygf_document_bom")
+public class DocumentBom extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 物料编码
+     */
+	@TableField("material_num")
+    private String materialNum;
+
+    /**
+     * 物料名称
+     */
+	@TableField("material_name")
+    private String materialName;
+
+    /**
+     * 物料类型
+     */
+	@TableField("material_type")
+    private String materialType;
+
+    /**
+     * 物料组
+     */
+	@TableField("material_group")
+    private String materialGroup;
+
+    /**
+     *  需求数量
+     */
+	@TableField("demand_number")
+    private Integer demandNumber;
+
+    /**
+     * 单价
+     */
+	@TableField("unit_price")
+    private Double unitPrice;
+
+    /**
+     *  折扣后价格
+     */
+	@TableField("discount_unit_price")
+    private Double discountUnitPrice;
+
+    /**
+     * 折扣总额
+     */
+	@TableField("discount_total")
+    private Double discountTotal;
+
+    /**
+     * 功率
+     */
+	@TableField("power")
+    private Double power;
+
+    /**
+     * 货单id
+     */
+	@TableField("preparation_money_id")
+    private Long preparationMoneyId;
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/DocumentStation.java

+package com.yeejoin.amos.boot.module.hygf.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("hygf_document_station")
+public class DocumentStation extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 发货单id
+     */
+	@TableField("preparation_money_id")
+    private Long preparationMoneyId;
+
+    /**
+     *  场站id
+     */
+	@TableField("station_id")
+    private Long stationId;
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/PreparationMoney.java

+package com.yeejoin.amos.boot.module.hygf.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 发货单
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("hygf_preparation_money")
+public class PreparationMoney extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *  单号
+     */
+	@TableField("odd_numbers")
+    private String oddNumbers;
+
+    /**
+     *  收货地址
+     */
+	@TableField("delivery_address")
+    private String deliveryAddress;
+
+    /**
+     * 详细地址
+     */
+	@TableField("detail_address")
+    private String detailAddress;
+
+    /**
+     *  下单人
+     */
+	@TableField("order_user")
+    private String orderUser;
+
+    /**
+     * 下单时间
+     */
+	@TableField("order_time")
+    private Date orderTime;
+
+    /**
+     * 经销商id
+     */
+	@TableField("dealer_id")
+    private String dealerId;
+
+    /**
+     * 经销商名称
+     */
+	@TableField("dealer_name")
+    private String dealerName;
+
+    /**
+     *  发货地址
+     */
+	@TableField("send_address")
+    private String sendAddress;
+
+    /**
+     *  业主类型
+     */
+	@TableField("owner_type")
+    private String ownerType;
+
+    /**
+     * 业务员
+     */
+	@TableField("salesman")
+    private String salesman;
+
+    /**
+     * 预估重量
+     */
+	@TableField("estimated_weight")
+    private Double estimatedWeight;
+
+    /**
+     * 备注
+     */
+	@TableField("notes")
+    private String notes;
+
+    /**
+     * 收货人
+     */
+	@TableField("consignee")
+    private String consignee;
+
+    /**
+     * 收货人手机号
+     */
+	@TableField("consignee_phone")
+    private String consigneePhone;
+
+    /**
+     * 收货人地址
+     */
+	@TableField("consignee_address")
+    private String consigneeAddress;
+
+    /**
+     * 收货人详细地址
+     */
+	@TableField("consignee_detail_address")
+    private String consigneeDetailAddress;
+
+    /**
+     * 发货单
+     */
+	@TableField("invoice")
+    private String invoice;
+
+    /**
+     * 收货单
+     */
+	@TableField("receipt")
+    private String receipt;
+
+    /**
+     * 订单状态0未完成1已完成2作废
+     */
+	@TableField("document_state")
+    private Integer documentState;
+
+    /**
+     * 发货状态 0 未发货1已发货
+     */
+	@TableField("shipment_status")
+    private Integer shipmentStatus;
+
+    /**
+     * 到货状态0未到货1已到货
+     */
+	@TableField("receiving_status")
+    private Integer receivingStatus;
+
+    /**
+     * 清单价格
+     */
+	@TableField("inventory_price")
+    private Double inventoryPrice;
+
+    /**
+     * 折扣
+     */
+	@TableField("discount")
+    private Double discount;
+
+    /**
+     * 促销
+     */
+	@TableField("promotion")
+    private Double promotion;
+
+    /**
+     * 合同价格
+     */
+	@TableField("contract_price")
+    private Double contractPrice;
+
+    /**
+     * 总价
+     */
+	@TableField("total_price")
+    private Double totalPrice;
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/DocumentBomMapper.java

+package com.yeejoin.amos.boot.module.hygf.api.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.hygf.api.entity.DocumentBom;
+
+/**
+ * 发货单bom Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+public interface DocumentBomMapper extends BaseMapper<DocumentBom> {
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/DocumentStationMapper.java

+package com.yeejoin.amos.boot.module.hygf.api.mapper;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.DocumentStation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+public interface DocumentStationMapper extends BaseMapper<DocumentStation> {
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PreparationMoneyMapper.java

+package com.yeejoin.amos.boot.module.hygf.api.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.hygf.api.entity.PreparationMoney;
+
+/**
+ * 发货单 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+public interface PreparationMoneyMapper extends BaseMapper<PreparationMoney> {
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IDocumentBomService.java

+package com.yeejoin.amos.boot.module.hygf.api.service;
+
+
+/**
+ * 发货单bom接口类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+public interface IDocumentBomService {
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IDocumentStationService.java

+package com.yeejoin.amos.boot.module.hygf.api.service;
+
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+public interface IDocumentStationService {
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IPreparationMoneyService.java

+package com.yeejoin.amos.boot.module.hygf.api.service;
+
+
+/**
+ * 发货单接口类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+public interface IPreparationMoneyService {
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/DocumentBomMapper.xml

+<?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.yeejoin.amos.boot.module.jxiop.api.mapper.DocumentBomMapper">
+
+</mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/DocumentStationMapper.xml

+<?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.yeejoin.amos.boot.module.jxiop.api.mapper.DocumentStationMapper">
+
+</mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/PreparationMoneyMapper.xml

+<?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.yeejoin.amos.boot.module.jxiop.api.mapper.PreparationMoneyMapper">
+
+</mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/DocumentBomController.java

+package com.yeejoin.amos.boot.module.hygf.biz.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.DocumentBomServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.hygf.api.dto.DocumentBomDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 发货单bom
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+@RestController
+@Api(tags = "发货单bomApi")
+@RequestMapping(value = "/document-bom")
+public class DocumentBomController extends BaseController {
+
+    @Autowired
+    DocumentBomServiceImpl documentBomServiceImpl;
+
+    /**
+     * 新增发货单bom
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增发货单bom", notes = "新增发货单bom")
+	public ResponseModel<DocumentBomDto> save(@RequestBody DocumentBomDto model) {
+	    model = documentBomServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新发货单bom", notes = "根据sequenceNbr更新发货单bom")
+	public ResponseModel<DocumentBomDto> updateBySequenceNbrDocumentBom(@RequestBody DocumentBomDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(documentBomServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除发货单bom", notes = "根据sequenceNbr删除发货单bom")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(documentBomServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个发货单bom",  notes = "根据sequenceNbr查询单个发货单bom")
+	public ResponseModel<DocumentBomDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(documentBomServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "发货单bom分页查询",  notes = "发货单bom分页查询")
+	public ResponseModel<Page<DocumentBomDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<DocumentBomDto> page = new Page<DocumentBomDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(documentBomServiceImpl.queryForDocumentBomPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "发货单bom列表全部数据查询",   notes = "发货单bom列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<DocumentBomDto>> selectForList() {
+	    return ResponseHelper.buildResponse(documentBomServiceImpl.queryForDocumentBomList());
+	}
+}

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/DocumentStationController.java

+package com.yeejoin.amos.boot.module.hygf.biz.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.DocumentStationServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.hygf.api.dto.DocumentStationDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/document-station")
+public class DocumentStationController extends BaseController {
+
+    @Autowired
+    DocumentStationServiceImpl documentStationServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<DocumentStationDto> save(@RequestBody DocumentStationDto model) {
+	    model = documentStationServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+	public ResponseModel<DocumentStationDto> updateBySequenceNbrDocumentStation(@RequestBody DocumentStationDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(documentStationServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(documentStationServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<DocumentStationDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(documentStationServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<DocumentStationDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<DocumentStationDto> page = new Page<DocumentStationDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(documentStationServiceImpl.queryForDocumentStationPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<DocumentStationDto>> selectForList() {
+	    return ResponseHelper.buildResponse(documentStationServiceImpl.queryForDocumentStationList());
+	}
+}

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PreparationMoneyController.java

+package com.yeejoin.amos.boot.module.hygf.biz.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.PreparationMoneyServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationMoneyDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 发货单
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+@RestController
+@Api(tags = "发货单Api")
+@RequestMapping(value = "/preparation-money")
+public class PreparationMoneyController extends BaseController {
+
+    @Autowired
+    PreparationMoneyServiceImpl preparationMoneyServiceImpl;
+
+    /**
+     * 新增发货单
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增发货单", notes = "新增发货单")
+	public ResponseModel<PreparationMoneyDto> save(@RequestBody PreparationMoneyDto model) {
+	    model = preparationMoneyServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新发货单", notes = "根据sequenceNbr更新发货单")
+	public ResponseModel<PreparationMoneyDto> updateBySequenceNbrPreparationMoney(@RequestBody PreparationMoneyDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(preparationMoneyServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除发货单", notes = "根据sequenceNbr删除发货单")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(preparationMoneyServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个发货单",  notes = "根据sequenceNbr查询单个发货单")
+	public ResponseModel<PreparationMoneyDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(preparationMoneyServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "发货单分页查询",  notes = "发货单分页查询")
+	public ResponseModel<Page<PreparationMoneyDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<PreparationMoneyDto> page = new Page<PreparationMoneyDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(preparationMoneyServiceImpl.queryForPreparationMoneyPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "发货单列表全部数据查询",   notes = "发货单列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<PreparationMoneyDto>> selectForList() {
+	    return ResponseHelper.buildResponse(preparationMoneyServiceImpl.queryForPreparationMoneyList());
+	}
+}

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/DocumentBomServiceImpl.java

+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.DocumentBom;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.DocumentBomMapper;
+import com.yeejoin.amos.boot.module.hygf.api.service.IDocumentBomService;
+import com.yeejoin.amos.boot.module.hygf.api.dto.DocumentBomDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 发货单bom服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+@Service
+public class DocumentBomServiceImpl extends BaseService<DocumentBomDto,DocumentBom,DocumentBomMapper> implements IDocumentBomService {
+    /**
+     * 分页查询
+     */
+    public Page<DocumentBomDto> queryForDocumentBomPage(Page<DocumentBomDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<DocumentBomDto> queryForDocumentBomList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/DocumentStationServiceImpl.java

+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.DocumentStation;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.DocumentStationMapper;
+import com.yeejoin.amos.boot.module.hygf.api.service.IDocumentStationService;
+import com.yeejoin.amos.boot.module.hygf.api.dto.DocumentStationDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+@Service
+public class DocumentStationServiceImpl extends BaseService<DocumentStationDto,DocumentStation,DocumentStationMapper> implements IDocumentStationService {
+    /**
+     * 分页查询
+     */
+    public Page<DocumentStationDto> queryForDocumentStationPage(Page<DocumentStationDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<DocumentStationDto> queryForDocumentStationList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PowerStationServiceImpl.java

@@ -263,7 +263,7 @@ public void updateSeve(String peasantHouseholdId, Map<String, Object> kv ){
         designInformationMapper.updateById(designInformationnew);
 
     }else{
-        DesignInformation designInformationnew=new DesignInformation();
+        DesignInformation designInformationnew=this.mapToBean(kv,DesignInformation.class);
         designInformationnew.setTypicalDiagram((List<Object>)kv.get("typicalDiagram")) ;
         designInformationnew.setPeasantHouseholdId(peasantHouseholdId);
         designInformationMapper.insert(designInformationnew);

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PreparationMoneyServiceImpl.java

+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.PreparationMoney;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.PreparationMoneyMapper;
+import com.yeejoin.amos.boot.module.hygf.api.service.IPreparationMoneyService;
+import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationMoneyDto;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 发货单服务实现类
+ *
+ * @author system_generator
+ * @date 2023-08-17
+ */
+@Service
+public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto,PreparationMoney,PreparationMoneyMapper> implements IPreparationMoneyService {
+    /**
+     * 分页查询
+     */
+    public Page<PreparationMoneyDto> queryForPreparationMoneyPage(Page<PreparationMoneyDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<PreparationMoneyDto> queryForPreparationMoneyList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file